(dir-locals-collect-mode-variables): Allow for any number of `mode'

and `eval' entries.  (Bug#3430)

lisp/ChangeLog

 2009-06-22  Glenn Morris  <rgm@gnu.org>
+	* 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

lisp/files.el

@@ -3213,7 +3213,9 @@ Returns the new list."
     (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)))))