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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/06/22 07:02:09

Modified files:
        lisp           : ChangeLog files.el 

Log message:
        (dir-locals-collect-mode-variables): Allow for any number of `mode'
        and `eval' entries.  (Bug#3430)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15709&r2=1.15710
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1051&r2=1.1052

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15709
retrieving revision 1.15710
diff -u -b -r1.15709 -r1.15710
--- ChangeLog   22 Jun 2009 06:36:49 -0000      1.15709
+++ ChangeLog   22 Jun 2009 07:02:04 -0000      1.15710
@@ -1,5 +1,8 @@
 2009-06-22  Glenn Morris  <address@hidden>
 
+       * files.el (dir-locals-collect-mode-variables): Allow for any number of
+       `mode' and `eval' entries.  (Bug#3430)
+
        * Makefile.in (ELCFILES): Add fadr.elc.
 
        * calendar/appt.el (appt-make-list): Fix off-by-one error caused by

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1051
retrieving revision 1.1052
diff -u -b -r1.1051 -r1.1052
--- files.el    18 Jun 2009 06:54:51 -0000      1.1051
+++ files.el    22 Jun 2009 07:02:08 -0000      1.1052
@@ -3213,7 +3213,9 @@
     (let* ((variable (car pair))
           (value (cdr pair))
           (slot (assq variable variables)))
-      (if slot
+      ;; If variables are specified more than once, only use the last.  (Why?)
+      ;; The pseudo-variables mode and eval are different (bug#3430).
+      (if (and slot (not (memq variable '(mode eval))))
          (setcdr slot value)
        ;; Need a new cons in case we setcdr later.
        (push (cons variable value) variables)))))