* help-fns.el (describe-variable): Make sure we get the right buffer name.

Suggested by Kelly Dean.

Fixes: debbugs:13105

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a49ecc49c50e651473f6632cbec3441e7363299..90086b27a5eef858c0715edcb6a57125f05beefc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-21  Chong Yidong  <cyd@gnu.org>
+
+       * help-fns.el (describe-variable): Make sure we get the right
+       buffer name (Bug#13105).  Suggested by Kelly Dean.
+
 2012-12-20  Michael R. Mauger  <mmaug@yahoo.com>
 
        * comint.el (comint-redirect-previous-input-string): New variable.

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index b552d8c1357049def701712a7fe79ee3a07ac31a..bb3695abcc2d801422c882c86fbe94238d13a004 100644 (file)
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -789,7 +789,7 @@ it is displayed along with the global value."
              (cond
                ((bufferp locus)
                 (princ (format "Local in buffer %s; "
-                               (buffer-name))))
+                               (buffer-name buffer))))
                ((framep locus)
                 (princ (format "It is a frame-local variable; ")))
                ((terminal-live-p locus)