[Emacs-diffs] /srv/bzr/emacs/trunk r99550: * files.el (hack-local-variables-filter): For eval forms, also

[Chong Yidong]

------------------------------------------------------------
revno: 99550
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-24 10:30:49 -0500
message:
  * files.el (hack-local-variables-filter): For eval forms, also
  check safe-local-variable-p (Bug#5636).
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-24 15:12:17 +0000
+++ b/lisp/ChangeLog    2010-02-24 15:30:49 +0000
@@ -1,3 +1,8 @@
+2010-02-24  Chong Yidong  <address@hidden>
+
+       * files.el (hack-local-variables-filter): For eval forms, also
+       check safe-local-variable-p (Bug#5636).
+
 2010-02-24  Eduard Wiebe  <address@hidden>
 
        * javascript.el (wisent-javascript-jv-expand-tag): Avoid c(ad)ddr

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2010-02-21 21:12:46 +0000
+++ b/lisp/files.el     2010-02-24 15:30:49 +0000
@@ -2981,6 +2981,7 @@
                 (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)