From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 2 Aug 2009 23:09:00 +0000 (+0000)
Subject: * help-fns.el (describe-variable): Treat list return values from
X-Git-Tag: emacs-pretest-23.1.90~1972
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6ce92f1c49b105bd7d13acd817a793a807d1e21;p=emacs.git

* 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 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")))