procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
and `eval' entries.  (Bug#3430)
This commit is contained in:
Glenn Morris 2009-06-22 07:02:04 +00:00
parent d5067810ac
commit 46253b3440
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
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

4
lisp/files.el
View file

@ -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)))))