From 8e5683eaa2c30c0d6f92e93618a5afe04385fd0e Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 7 Apr 2017 19:24:21 -0400 Subject: [PATCH] lang/{javascript,cc}: fix empty buffer-file-name in magic-mode-alist --- modules/lang/cc/config.el | 9 ++++++--- modules/lang/javascript/config.el | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 7e9377744..e53a718d9 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -6,7 +6,8 @@ :init ;; Auto-detect C++ header files (push (cons (lambda () - (and (equal (file-name-extension buffer-file-name) "h") + (and buffer-file-name + (equal (file-name-extension buffer-file-name) "h") (or (file-exists-p (expand-file-name (concat (file-name-sans-extension buffer-file-name) ".cpp"))) @@ -18,8 +19,10 @@ magic-mode-alist) ;; Auto-detect Obj-C header files - (push (cons (lambda () (and (equal (file-name-extension buffer-file-name) "h") - (re-search-forward "@\\" magic-mode-regexp-match-limit t))) + (push (cons (lambda () + (and buffer-file-name + (equal (file-name-extension buffer-file-name) "h") + (re-search-forward "@\\" magic-mode-regexp-match-limit t))) 'objc-mode) magic-mode-alist) diff --git a/modules/lang/javascript/config.el b/modules/lang/javascript/config.el index ae07f767c..a6f6e9884 100644 --- a/modules/lang/javascript/config.el +++ b/modules/lang/javascript/config.el @@ -107,7 +107,8 @@ :init ;; auto-detect JSX file (push (cons (lambda () - (and (equal (file-name-extension buffer-file-name) "js") + (and buffer-file-name + (equal (file-name-extension buffer-file-name) "js") (re-search-forward "\\(^\\s-*import React\\|\\( from \\|require(\\)[\"']react\\)" magic-mode-regexp-match-limit t) (progn