2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00448b64715..dd5ab69e37c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-02  Drake Wilson  <drake@begriffli.ch>  (tiny change)
+
+        * files.el (hack-local-variables): Fix membership tests to avoid
+        treating all variables as safe if `enable-local-variables' is
+        set to :safe.
+
 2007-11-02  Glenn Morris  <rgm@gnu.org>
 
         * progmodes/etags.el (tags-table-mode): Disable undo.
diff --git a/lisp/files.el b/lisp/files.el
index 9ae4396946b..169912b94bc 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2764,8 +2764,8 @@ is specified, returning t if it is specified."
                 ;; If caller wants only the safe variables,
                 ;; install only them.
                 (dolist (elt result)
-                  (unless (or (memq (car elt) unsafe-vars)
-                              (memq (car elt) risky-vars))
+                  (unless (or (member elt unsafe-vars)
+                              (member elt risky-vars))
                     (hack-one-local-variable (car elt) (cdr elt))))
               ;; Query, except in the case where all are known safe
               ;; if the user wants no quuery in that case.