Commit b6ce92f1 authored by Chong Yidong's avatar Chong Yidong
Browse files

* help-fns.el (describe-variable): Treat list return values from

dir-locals-find-file properly (Bug#4005).
parent 40d2791f
2009-08-02 Chong Yidong <cyd@stupidchicken.com>
* help-fns.el (describe-variable): Treat list return values from
dir-locals-find-file properly (Bug#4005).
2009-08-02 Julian Scheid <julians37@googlemail.com> (tiny change)
* net/tramp.el (tramp-debug-message): Print also microseconds.
......
......@@ -719,7 +719,12 @@ it is displayed along with the global value."
(not (file-remote-p (buffer-file-name)))
(dir-locals-find-file (buffer-file-name)))))
(princ " This variable is a directory local variable")
(if file (princ (concat "\n from the file \"" file "\"")))
(when file
(princ (concat "\n from the file \""
(if (consp file)
(car file)
file)
"\"")))
(princ ".\n"))
(princ " This variable is a file local variable.\n")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment