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

dir-locals-find-file properly (Bug#4005).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e7debbd7ad1e5e2eac6484d80e683d1dd0ded42..2f3ea144e7d11bd1d4f1013057453544c80426e1 100644 (file)
--- 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 9546396fd87bc87cbcbef906c9eabbf8a9b14e8f..7747c505ec98033ea3a82c2e60bd909b676561bf 100644 (file)
--- 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")))