diff options
| author | Alan Mackenzie <acm@muc.de> | 2009-07-19 19:47:38 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2009-07-19 19:47:38 +0000 |
| commit | f8a1c7a74abaf426dc72f58cf9d38a4b3cb9e1d7 (patch) | |
| tree | 4c8617f913617f63bf4ad682d71ca02ef489f976 | |
| parent | e5cc0fc3200c5e1fee368f81fb667ca7d2b68d81 (diff) | |
| download | emacs-f8a1c7a74abaf426dc72f58cf9d38a4b3cb9e1d7.tar.gz | |
Revert previous change.
| -rw-r--r-- | lisp/files.el | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lisp/files.el b/lisp/files.el index b2f8e1a2829..a58580a8bf7 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2960,11 +2960,7 @@ DIR-NAME is a directory name if these settings come from (dolist (elt variables) (unless (or (member elt unsafe-vars) (member elt risky-vars)) - (let ((var (car elt))) - (unless (eq var 'eval) - (setq file-local-variables-alist - (assq-delete-all var file-local-variables-alist))) - (push elt file-local-variables-alist)))) + (push elt file-local-variables-alist))) ;; Query, unless all are known safe or the user wants no ;; querying. (if (or (and (eq enable-local-variables t) @@ -2974,12 +2970,7 @@ DIR-NAME is a directory name if these settings come from (hack-local-variables-confirm variables unsafe-vars risky-vars dir-name)) (dolist (elt variables) - (let ((var (car elt))) - (unless (eq var 'eval) - (setq file-local-variables-alist - (assq-delete-all var file-local-variables-alist))) - (push elt file-local-variables-alist)))))))) - + (push elt file-local-variables-alist))))))) (defun hack-local-variables (&optional mode-only) "Parse and put into effect this buffer's local variables spec. @@ -3082,7 +3073,6 @@ is specified, returning t if it is specified." (enable-local-variables (hack-local-variables-filter result nil) (when file-local-variables-alist - ;; Any 'evals must run in the Right sequence. (setq file-local-variables-alist (nreverse file-local-variables-alist)) (run-hooks 'before-hack-local-variables-hook) |