From d450f2a250afb0997d8f9c4554b02d4d7aa9af50 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 14 Feb 2006 19:54:25 +0000 Subject: [PATCH] * files.el (hack-local-variables): Remove ignored variables before checking if any variables need setting. --- lisp/ChangeLog | 5 +++++ lisp/files.el | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ae02450785..d5f95771d20 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-02-14 Chong Yidong + + * files.el (hack-local-variables): Remove ignored variables before + checking if any variables need setting. + 2006-02-14 Jan Dj,Ad(Brv * cus-start.el (all): Add x-gtk-whole-detached-tool-bar. diff --git a/lisp/files.el b/lisp/files.el index 0096916ce0b..9aab6209db4 100644 --- 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) -- 2.39.2