[Emacs-diffs] emacs/lisp files.el [EMACS_23_1_RC]

[Alan Mackenzie]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Alan Mackenzie <acmacm> 09/07/19 19:47:38

Modified files:
        lisp           : files.el 

Log message:
        Revert previous change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.1051.2.3&r2=1.1051.2.4

Patches:
Index: files.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/files.el,v
retrieving revision 1.1051.2.3
retrieving revision 1.1051.2.4
diff -u -b -r1.1051.2.3 -r1.1051.2.4
--- files.el    18 Jul 2009 21:02:52 -0000      1.1051.2.3
+++ files.el    19 Jul 2009 19:47:38 -0000      1.1051.2.4
@@ -2960,11 +2960,7 @@
          (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 @@
                (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 @@
          (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)