From 3968c89ffe41372c3188f1d695a21dd2d9b9ea22 Mon Sep 17 00:00:00 2001 From: Masatake YAMATO Date: Tue, 17 Jan 2006 18:11:53 +0000 Subject: Added makefile-imake-mode. --- lisp/files.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/files.el') diff --git a/lisp/files.el b/lisp/files.el index 2b439e20d3f..d1202f99d3a 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) -- cgit v1.2.3 From f36d46caffc209065f29e7e7fa8daa01994d2e88 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 26 Jan 2006 17:55:04 +0000 Subject: (risky-local-variable-p): Follow var aliases. --- lisp/files.el | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lisp/files.el') diff --git a/lisp/files.el b/lisp/files.el index d1202f99d3a..112056e4f9e 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2450,6 +2450,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$" -- cgit v1.2.3