[Emacs-diffs] trunk r116315: * lisp/help-fns.el (describe-variable):

[Glenn Morris]

------------------------------------------------------------
revno: 116315
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-07 21:55:04 -0500
message:
  * lisp/help-fns.el (describe-variable):
  Check {file,dir}-local-variables-alist, and buffer-file-name,
  in the correct buffer.
  
  This seems to have Just Worked in 24.3 - when and why did it change?
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/help-fns.el               helpfns.el-20091113204419-o5vbwnq5f7feedwu-2354

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-08 02:18:31 +0000
+++ b/lisp/ChangeLog    2014-02-08 02:55:04 +0000
@@ -1,3 +1,9 @@
+2014-02-08  Glenn Morris  <address@hidden>
+
+       * help-fns.el (describe-variable):
+       Check {file,dir}-local-variables-alist, and buffer-file-name,
+       in the correct buffer.
+
 2014-02-08  Ingo Lohmar  <address@hidden>
 
        * help-fns.el (describe-variable): Fix the case where

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2014-02-08 02:18:31 +0000
+++ b/lisp/help-fns.el  2014-02-08 02:55:04 +0000
@@ -911,13 +911,18 @@
                             (t ".")))
                 (terpri))
 
-             (when (member (cons variable val) file-local-variables-alist)
+             (when (member (cons variable val)
+                            (with-current-buffer buffer
+                              file-local-variables-alist))
                (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)))
+               (if (member (cons variable val)
+                             (with-current-buffer buffer
+                               dir-local-variables-alist))
+                   (let ((file (and (buffer-file-name buffer)
+                                      (not (file-remote-p
+                                            (buffer-file-name buffer)))
                                       (dir-locals-find-file
-                                       (buffer-file-name))))
+                                       (buffer-file-name buffer))))
                           (dir-file t))
                      (princ "  This variable's value is directory-local")
                      (if (null file)