aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2009-10-11 23:53:22 +0000
committerJuri Linkov2009-10-11 23:53:22 +0000
commit4d9b432332dbe48a7fd64ae24fcbf8a12232a8c2 (patch)
tree9931f51bc06302445e3e1c339bd477a311b03609
parent585eedef9107d0f4769592c0f0324a073fe97283 (diff)
downloademacs-4d9b432332dbe48a7fd64ae24fcbf8a12232a8c2.tar.gz
emacs-4d9b432332dbe48a7fd64ae24fcbf8a12232a8c2.zip
(read-file-local-variable-value):
Provide default value only for bound variables.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/files-x.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd1333af152..cb99af982e5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-10-11 Juri Linkov <juri@jurta.org>
2
3 * files-x.el (read-file-local-variable-value):
4 Provide default value only for bound variables (bug#4664).
5
12009-10-11 Michael Albinus <michael.albinus@gmx.de> 62009-10-11 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-local-host-p): Function shall return nil for 8 * net/tramp.el (tramp-local-host-p): Function shall return nil for
diff --git a/lisp/files-x.el b/lisp/files-x.el
index 3ad3f90e407..8261df18b51 100644
--- a/lisp/files-x.el
+++ b/lisp/files-x.el
@@ -92,7 +92,8 @@ Intended to be used in the `interactive' spec of
92 nil 'set-variable-value-history 92 nil 'set-variable-value-history
93 (format "%S" 93 (format "%S"
94 (cond ((eq variable 'unibyte) t) 94 (cond ((eq variable 'unibyte) t)
95 (t (symbol-value variable)))))))))) 95 ((boundp variable)
96 (symbol-value variable))))))))))
96 97
97(defun read-file-local-variable-mode () 98(defun read-file-local-variable-mode ()
98 "Read per-directory file-local variable's mode using completion. 99 "Read per-directory file-local variable's mode using completion.