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

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

* files.el (hack-local-variables-filter): For eval forms, also
check safe-local-variable-p (Bug#5636).
f95a5fd0 · Chong Yidong · 6583ba0e · f95a5fd0 · f95a5fd0
Commit f95a5fd0 authored Feb 24, 2010 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/files.el lisp/files.el +1 -0

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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

--- 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)