changeset 103988:b36e20a63164

* files.el (hack-local-variables-filter): Fix last change.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 20 Jul 2009 14:21:27 +0000
parents 88eb7005144e
children 740cb01b8b8f
files lisp/ChangeLog lisp/files.el
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Jul 20 13:58:01 2009 +0000
+++ b/lisp/ChangeLog	Mon Jul 20 14:21:27 2009 +0000
@@ -1,3 +1,7 @@
+2009-07-20  Chong Yidong  <cyd@stupidchicken.com>
+
+	* files.el (hack-local-variables-filter): Fix last change.
+
 2009-07-19  Juri Linkov  <juri@jurta.org>
 
 	* files.el (ignored-local-variables): Add `dir-local-variables-alist'.
--- a/lisp/files.el	Mon Jul 20 13:58:01 2009 +0000
+++ b/lisp/files.el	Mon Jul 20 14:21:27 2009 +0000
@@ -2973,7 +2973,7 @@
 	 (or (and (eq enable-local-variables t)
 		  (null unsafe-vars)
 		  (null risky-vars))
-	     (eq enable-local-variables :all)
+	     (memq enable-local-variables '(:all :safe))
 	     (hack-local-variables-confirm all-vars unsafe-vars
 					   risky-vars dir-name))
 	 (dolist (elt all-vars)