Mercurial > emacs
changeset 68891:ca6b93e0f08b
* files.el (hack-local-variables): Remove ignored variables before
checking if any variables need setting.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 14 Feb 2006 19:54:25 +0000 |
| parents | f28141279aa2 |
| children | 93b583aac002 |
| files | lisp/ChangeLog lisp/files.el |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Feb 14 15:32:55 2006 +0000 +++ b/lisp/ChangeLog Tue Feb 14 19:54:25 2006 +0000 @@ -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,Ad(Brv <jan.h.d@swipnet.se> * cus-start.el (all): Add x-gtk-whole-detached-tool-bar.
--- a/lisp/files.el Tue Feb 14 15:32:55 2006 +0000 +++ b/lisp/files.el Tue Feb 14 19:54:25 2006 +0000 @@ -2439,12 +2439,12 @@ ;; 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)