# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1267025449 18000
# Node ID f824258be7d139456555c8da5a5841fe238e648e
# Parent  5b5e4a97bbce0548b995f47cf53be5c0738f271c
* files.el (hack-local-variables-filter): For eval forms, also
check safe-local-variable-p (Bug#5636).

diff -r 5b5e4a97bbce -r f824258be7d1 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Feb 24 10:12:17 2010 -0500
+++ b/lisp/ChangeLog	Wed Feb 24 10:30:49 2010 -0500
@@ -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 -r 5b5e4a97bbce -r f824258be7d1 lisp/files.el
--- a/lisp/files.el	Wed Feb 24 10:12:17 2010 -0500
+++ b/lisp/files.el	Wed Feb 24 10:30:49 2010 -0500
@@ -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)