diff options
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/files.el b/lisp/files.el index 8d042954281..d13e37752b1 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1812,6 +1812,7 @@ in that case, this function acts as if `enable-local-variables' were t." ("\\.ad[abs]\\'" . ada-mode) ("\\.ad[bs].dg\\'" . ada-mode) ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode) + ("Imakefile\\'" . makefile-imake-mode) ,@(if (memq system-type '(berkeley-unix next-mach darwin)) '(("\\.mk\\'" . makefile-bsdmake-mode) ("GNUmakefile\\'" . makefile-gmake-mode) @@ -2450,6 +2451,10 @@ is specified, returning t if it is specified." "Non-nil if SYM could be dangerous as a file-local variable with value VAL. If VAL is nil or omitted, the question is whether any value might be dangerous." + ;; If this is an alias, check the base name. + (condition-case nil + (setq sym (indirect-variable sym)) + (error nil)) (let ((safep (get sym 'safe-local-variable))) (or (get sym 'risky-local-variable) (and (string-match "-hooks?$\\|-functions?$\\|-forms?$\\|-program$\\|-commands?$\\|-predicates?$\\|font-lock-keywords$\\|font-lock-keywords-[0-9]+$\\|font-lock-syntactic-keywords$\\|-frame-alist$\\|-mode-alist$\\|-map$\\|-map-alist$" |