# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1249254540 0
# Node ID 0bef83c2fc082a3916d2457f6c149bc058d7af9c
# Parent  6d40e5112f4e238a4494794738da0c97770bcff8
* help-fns.el (describe-variable): Treat list return values from
dir-locals-find-file properly (Bug#4005).

diff -r 6d40e5112f4e -r 0bef83c2fc08 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Aug 02 22:51:32 2009 +0000
+++ b/lisp/ChangeLog	Sun Aug 02 23:09:00 2009 +0000
@@ -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 -r 6d40e5112f4e -r 0bef83c2fc08 lisp/help-fns.el
--- a/lisp/help-fns.el	Sun Aug 02 22:51:32 2009 +0000
+++ b/lisp/help-fns.el	Sun Aug 02 23:09:00 2009 +0000
@@ -719,7 +719,12 @@
 				     (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")))