Fix for another bit of bug#8095, re dir-locals.

* lisp/help-fns.el (describe-variable): Return consistent results when a
dir-local from a file came from the cache or did not.
If a dir-local has no associated file, say it came from a "directory".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb0708aa0fa3d1f181d6c2ddb913f7633e30481a..05bddd0a7d929f1a9b3c812f44ccd9e4e19fc305 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,15 @@
 2011-02-24  Glenn Morris  <rgm@gnu.org>
 
+       * help-fns.el (describe-variable): Return consistent results when a
+       dir-local from a file came from the cache or did not.  (Bug#8095)
+       If a dir-local has no associated file, say it came from a "directory".
+
        * files.el (hack-dir-local-variables): Fix setting of `dir-name'.
        (hack-local-variables-confirm, hack-local-variables-filter): Doc fix.
 
        * files.el (dir-locals-find-file): Doc fix.
        Fix the check for cache elements that have no associated file,
-       and the mtime check for those that do.
+       and the mtime check for those that do.  (Bug#8095)
 
        * dired-x.el (dired-hack-local-variables):
        Handle interrupts during hacking local variables.  (Bug#5216)

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 1cd5526fcff4b24c1653c9a8c885f7a9e0338c46..38e331dc992aa583c5e3613260d71965f1aaf369 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -748,15 +748,21 @@ it is displayed along with the global value."
                (setq extra-line t)
                (if (member (cons variable val) dir-local-variables-alist)
                    (let ((file (and (buffer-file-name)
-                                    (not (file-remote-p (buffer-file-name)))
-                                    (dir-locals-find-file (buffer-file-name)))))
+                                      (not (file-remote-p (buffer-file-name)))
+                                      (dir-locals-find-file
+                                       (buffer-file-name))))
+                          (type "file"))
                      (princ "  This variable is a directory local variable")
                      (when file
-                       (princ (concat "\n  from the file \""
-                                      (if (consp file)
-                                          (car file)
-                                        file)
-                                      "\"")))
+                        (if (consp file) ; result from cache
+                            ;; If the cache element has an mtime, we
+                            ;; assume it came from a file.
+                            (if (nth 2 file)
+                                (setq file (expand-file-name
+                                            dir-locals-file (car file)))
+                              ;; Otherwise, assume it was set directly.
+                              (setq type "directory")))
+                       (princ (format "\n  from the %s \"%s\"" type file)))
                      (princ ".\n"))
                  (princ "  This variable is a file local variable.\n")))