aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-12-21 11:37:02 +0800
committerChong Yidong2012-12-21 11:37:02 +0800
commitf5733f8759da4d44d72eda19afc36860f32d1217 (patch)
treea1fe791e6ef53760910f4ff91a310404b7e1cdc9
parentfab6916d0c0e5c0f8a942ed040fe7f5d0013b145 (diff)
downloademacs-f5733f8759da4d44d72eda19afc36860f32d1217.tar.gz
emacs-f5733f8759da4d44d72eda19afc36860f32d1217.zip
* help-fns.el (describe-variable): Make sure we get the right buffer name.
Suggested by Kelly Dean. Fixes: debbugs:13105
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help-fns.el2
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 @@
12012-12-21 Chong Yidong <cyd@gnu.org>
2
3 * help-fns.el (describe-variable): Make sure we get the right
4 buffer name (Bug#13105). Suggested by Kelly Dean.
5
12012-12-20 Michael R. Mauger <mmaug@yahoo.com> 62012-12-20 Michael R. Mauger <mmaug@yahoo.com>
2 7
3 * comint.el (comint-redirect-previous-input-string): New variable. 8 * 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."
789 (cond 789 (cond
790 ((bufferp locus) 790 ((bufferp locus)
791 (princ (format "Local in buffer %s; " 791 (princ (format "Local in buffer %s; "
792 (buffer-name)))) 792 (buffer-name buffer))))
793 ((framep locus) 793 ((framep locus)
794 (princ (format "It is a frame-local variable; "))) 794 (princ (format "It is a frame-local variable; ")))
795 ((terminal-live-p locus) 795 ((terminal-live-p locus)