* files.el (hack-local-variables-filter): For eval forms, also

check safe-local-variable-p (Bug#5636).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3e8e19f7cc430c84a5888e8a99df4ba315b5877a..d0cdaf25a23f45ed5959ef3d36e35915d5f85164 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-24  Chong Yidong  <cyd@stupidchicken.com>
+
+       * files.el (hack-local-variables-filter): For eval forms, also
+       check safe-local-variable-p (Bug#5636).
+
 2010-02-24  Eduard Wiebe  <usenet@pusto.de>
 
        * javascript.el (wisent-javascript-jv-expand-tag): Avoid c(ad)ddr

diff --git a/lisp/files.el b/lisp/files.el
index ee03c115cf8f3085b9770059a998ed1e4c043e93..d6783f82fbb6bcbaea0eb208b6df35c68c239b6c 100644 (file)
--- 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)