diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-08-02 23:09:00 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-08-02 23:09:00 +0000 |
| commit | b6ce92f1c49b105bd7d13acd817a793a807d1e21 (patch) | |
| tree | 807a09fe08d534071c7296f3f470407b44143885 /lisp | |
| parent | 40d2791f9b21c3a9a1ed865c148e5042df57a084 (diff) | |
| download | emacs-b6ce92f1c49b105bd7d13acd817a793a807d1e21.tar.gz emacs-b6ce92f1c49b105bd7d13acd817a793a807d1e21.tar.bz2 emacs-b6ce92f1c49b105bd7d13acd817a793a807d1e21.zip | |
* help-fns.el (describe-variable): Treat list return values from
dir-locals-find-file properly (Bug#4005).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/help-fns.el | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5e7debbd7ad..2f3ea144e7d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +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. diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 9546396fd87..7747c505ec9 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -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"))) |