* files.el (hack-local-variables): Remove ignored variables before

	checking if any variables need setting.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ae024507859d5b7d5c2fb6eceb80381467715f2..d5f95771d20be0ab02f9ba8130bc2ea5202e2cd5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-14  Chong Yidong  <cyd@stupidchicken.com>
+
+       * files.el (hack-local-variables): Remove ignored variables before
+       checking if any variables need setting.
+
 2006-02-14  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * cus-start.el (all): Add x-gtk-whole-detached-tool-bar.

diff --git a/lisp/files.el b/lisp/files.el
index 0096916ce0bfaff77af677bc7df3f87df5e0cb0e..9aab6209db4b45ebee4af20b55f9ace0749d96ba 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2439,12 +2439,12 @@ is specified, returning t if it is specified."
       ;; variables (if MODE-ONLY is nil.)
       (if mode-only
          result
+       (dolist (ignored ignored-local-variables)
+         (setq result (assq-delete-all ignored result)))
+       (if (null enable-local-eval)
+           (setq result (assq-delete-all 'eval result)))
        (when result
          (setq result (nreverse result))
-         (dolist (ignored ignored-local-variables)
-           (setq result (assq-delete-all ignored result)))
-         (if (null enable-local-eval)
-             (setq result (assq-delete-all 'eval result)))
          ;; Find those variables that we may want to save to
          ;; `safe-local-variable-values'.
          (let (risky-vars unsafe-vars)