auto upstream

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a49ecc49c5..90086b27a5e 100644
--- 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 b552d8c1357..bb3695abcc2 100644
--- 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)