Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
46253b34
Commit
46253b34
authored
Jun 22, 2009
by
Glenn Morris
Browse files
(dir-locals-collect-mode-variables): Allow for any number of `mode'
and `eval' entries. (Bug#3430)
parent
d5067810
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
lisp/ChangeLog
lisp/ChangeLog
+3
-0
lisp/files.el
lisp/files.el
+3
-1
No files found.
lisp/ChangeLog
View file @
46253b34
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
View file @
46253b34
...
...
@@ -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)))))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment