[Emacs-diffs] emacs/lisp ChangeLog help-fns.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/08/02 23:09:04

Modified files:
        lisp           : ChangeLog help-fns.el 

Log message:
        * help-fns.el (describe-variable): Treat list return values from
        dir-locals-find-file properly (Bug#4005).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15878&r2=1.15879
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/help-fns.el?cvsroot=emacs&r1=1.135&r2=1.136

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15878
retrieving revision 1.15879
diff -u -b -r1.15878 -r1.15879
--- ChangeLog   2 Aug 2009 17:21:16 -0000       1.15878
+++ ChangeLog   2 Aug 2009 23:09:00 -0000       1.15879
@@ -1,3 +1,8 @@
+2009-08-02  Chong Yidong  <address@hidden>
+
+       * help-fns.el (describe-variable): Treat list return values from
+       dir-locals-find-file properly (Bug#4005).
+
 2009-08-02  Julian Scheid <address@hidden>  (tiny change)
 
        * net/tramp.el (tramp-debug-message): Print also microseconds.

Index: help-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- help-fns.el 23 Jul 2009 02:55:37 -0000      1.135
+++ help-fns.el 2 Aug 2009 23:09:04 -0000       1.136
@@ -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")))