summaryrefslogtreecommitdiff
path: root/lisp/files.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-02-24 10:30:49 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-02-24 10:30:49 -0500
commitf95a5fd02f33b3002d98745396efa4097c616300 (patch)
tree9fca50c293aba6f667016f57b182c3744676df7f /lisp/files.el
parent6583ba0ea52f2def6484d562e4d3de88a059d0a3 (diff)
downloademacs-f95a5fd02f33b3002d98745396efa4097c616300.tar.gz
* files.el (hack-local-variables-filter): For eval forms, also
check safe-local-variable-p (Bug#5636).
Diffstat (limited to 'lisp/files.el')
-rw-r--r--lisp/files.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/files.el b/lisp/files.el
index ee03c115cf8..d6783f82fbb 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2981,6 +2981,7 @@ DIR-NAME is a directory name if these settings come from
(push elt all-vars)
(or (eq enable-local-eval t)
(hack-one-local-variable-eval-safep (eval (quote val)))
+ (safe-local-variable-p var val)
(push elt unsafe-vars))))
;; Ignore duplicates (except `mode') in the present list.
((and (assq var all-vars) (not (eq var 'mode))) nil)