diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/help.el | 2 |
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 @@ | |||
| 1 | 2011-09-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * help.el (describe-key-briefly): Copy previous standard-output change. | ||
| 4 | |||
| 1 | 2011-09-13 PJ Weisberg <pj@irregularexpressions.net> (tiny change) | 5 | 2011-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)) |