aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Francoise2007-11-02 11:03:43 +0000
committerRomain Francoise2007-11-02 11:03:43 +0000
commit3020ee9278142603cb65e04f75cdcf363637860d (patch)
treeb99f16aac3b4265ffb35c40dfa0f50060adf3034
parent8e004a4407ad7524372b0a63566bf7b501da2776 (diff)
downloademacs-3020ee9278142603cb65e04f75cdcf363637860d.tar.gz
emacs-3020ee9278142603cb65e04f75cdcf363637860d.zip
2007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change)
* files.el (hack-local-variables): Fix membership tests to avoid treating all variables as safe if `enable-local-variables' is set to :safe.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/files.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c9987ff1f5a..17e6ba20f54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change)
2
3 * files.el (hack-local-variables): Fix membership tests to avoid
4 treating all variables as safe if `enable-local-variables' is
5 set to :safe.
6
12007-11-02 Glenn Morris <rgm@gnu.org> 72007-11-02 Glenn Morris <rgm@gnu.org>
2 8
3 * newcomment.el (comment-indent): Let comment-insert-comment-function, 9 * newcomment.el (comment-indent): Let comment-insert-comment-function,
diff --git a/lisp/files.el b/lisp/files.el
index 6b0bd26efe8..f2caa0abe82 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2821,8 +2821,8 @@ is specified, returning t if it is specified."
2821 ;; If caller wants only the safe variables, 2821 ;; If caller wants only the safe variables,
2822 ;; install only them. 2822 ;; install only them.
2823 (dolist (elt result) 2823 (dolist (elt result)
2824 (unless (or (memq (car elt) unsafe-vars) 2824 (unless (or (member elt unsafe-vars)
2825 (memq (car elt) risky-vars)) 2825 (member elt risky-vars))
2826 (hack-one-local-variable (car elt) (cdr elt)))) 2826 (hack-one-local-variable (car elt) (cdr elt))))
2827 ;; Query, except in the case where all are known safe 2827 ;; Query, except in the case where all are known safe
2828 ;; if the user wants no quuery in that case. 2828 ;; if the user wants no quuery in that case.