diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/help.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 61ef1a21065..2973fa64360 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-08-23 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * help.el (help-window-setup): Fix message displayed when other | ||
| 4 | window is reused. (Bug#9341) | ||
| 5 | |||
| 1 | 2011-08-23 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2011-08-23 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * shell.el (shell-completion-vars): Set pcomplete-arg-quote-list. | 8 | * shell.el (shell-completion-vars): Set pcomplete-arg-quote-list. |
diff --git a/lisp/help.el b/lisp/help.el index e6496f625d1..710dc34ea89 100644 --- a/lisp/help.el +++ b/lisp/help.el | |||
| @@ -1104,7 +1104,7 @@ This relies on `display-buffer-window' being correctly set up by | |||
| 1104 | ((eq help-value 'new-window) | 1104 | ((eq help-value 'new-window) |
| 1105 | "Type \\[delete-other-windows] to delete the help window") | 1105 | "Type \\[delete-other-windows] to delete the help window") |
| 1106 | ((eq help-value 'reuse-other-window) | 1106 | ((eq help-value 'reuse-other-window) |
| 1107 | "Type \\[switch-to-prev-buffer] RET to restore previous buffer")) | 1107 | "Type \"q\" in other window to quit")) |
| 1108 | help-window 'other)) | 1108 | help-window 'other)) |
| 1109 | (t | 1109 | (t |
| 1110 | ;; Not much to say here. | 1110 | ;; Not much to say here. |