aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2013-06-25 23:48:54 +0300
committerJuri Linkov2013-06-25 23:48:54 +0300
commite080a9d7307025e73c9682c201e60206f7b4e808 (patch)
tree8846a9d7031b6fa9d15bb946e459e3cb73c7801a
parentec64c2738515452c75a38c31537c2b495bb77c74 (diff)
downloademacs-e080a9d7307025e73c9682c201e60206f7b4e808.tar.gz
emacs-e080a9d7307025e73c9682c201e60206f7b4e808.zip
* lisp/files-x.el (read-file-local-variable-value): Add `default'.
Fixes: debbugs:14710
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/files-x.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9dd5772b327..d65ffc0cf5c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,9 @@
3 * files-x.el (modify-dir-local-variable): Change the header comment 3 * files-x.el (modify-dir-local-variable): Change the header comment
4 in the file with directory local variables. (Bug#14692) 4 in the file with directory local variables. (Bug#14692)
5 5
6 * files-x.el (read-file-local-variable-value): Add `default'.
7 (Bug#14710)
8
62013-06-25 Lars Magne Ingebrigtsen <larsi@gnus.org> 92013-06-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
7 10
8 * net/eww.el (eww-make-unique-file-name): Create a unique file 11 * net/eww.el (eww-make-unique-file-name): Create a unique file
diff --git a/lisp/files-x.el b/lisp/files-x.el
index c9ff931cd55..adc2b8b3bf3 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -90,7 +90,8 @@ Intended to be used in the `interactive' spec of
90 (minibuffer-completing-symbol t)) 90 (minibuffer-completing-symbol t))
91 (read-from-minibuffer (format "Add %s with value: " variable) 91 (read-from-minibuffer (format "Add %s with value: " variable)
92 nil read-expression-map t 92 nil read-expression-map t
93 'set-variable-value-history))))) 93 'set-variable-value-history
94 default)))))
94 95
95(defun read-file-local-variable-mode () 96(defun read-file-local-variable-mode ()
96 "Read per-directory file-local variable's mode using completion. 97 "Read per-directory file-local variable's mode using completion.