aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-09-13 00:22:05 -0700
committerGlenn Morris2011-09-13 00:22:05 -0700
commitb2cba41ecdc954c6dc01567e279c969aa9710239 (patch)
tree243b19ed880cf264565d85b043561d1932dbe95d
parente3ce671f377f6bb09576c90847724ea5a1e64fd5 (diff)
downloademacs-b2cba41ecdc954c6dc01567e279c969aa9710239.tar.gz
emacs-b2cba41ecdc954c6dc01567e279c969aa9710239.zip
* lisp/help.el (describe-key-briefly): Copy previous standard-output change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/help.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c041ef45639..5cb76a1394a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-09-13 Glenn Morris <rgm@gnu.org>
2
3 * help.el (describe-key-briefly): Copy previous standard-output change.
4
12011-09-13 PJ Weisberg <pj@irregularexpressions.net> (tiny change) 52011-09-13 PJ Weisberg <pj@irregularexpressions.net> (tiny change)
2 6
3 * help.el (where-is): Respect non-standard standard-output. (Bug#9030) 7 * help.el (where-is): Respect non-standard standard-output. (Bug#9030)
diff --git a/lisp/help.el b/lisp/help.el
index 0c5ebea1b04..ca8f76515cf 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -625,7 +625,7 @@ temporarily enables it to allow getting help on disabled items and buttons."
625 (aref key 1) 625 (aref key 1)
626 (aref key 0))) 626 (aref key 0)))
627 (modifiers (event-modifiers event)) 627 (modifiers (event-modifiers event))
628 (standard-output (if insert (current-buffer) t)) 628 (standard-output (if insert (current-buffer) standard-output))
629 (mouse-msg (if (or (memq 'click modifiers) (memq 'down modifiers) 629 (mouse-msg (if (or (memq 'click modifiers) (memq 'down modifiers)
630 (memq 'drag modifiers)) " at that spot" "")) 630 (memq 'drag modifiers)) " at that spot" ""))
631 (defn (key-binding key t)) 631 (defn (key-binding key t))