aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-08-23 11:31:54 +0200
committerMartin Rudalics2011-08-23 11:31:54 +0200
commit3bbf23bc315e8cf47c459148dad86adeb3e38242 (patch)
treed328f929970b81c92186c1003155798ae3551797
parent425cc014ac9191debe8c01dc360685486bba0ff1 (diff)
downloademacs-3bbf23bc315e8cf47c459148dad86adeb3e38242.tar.gz
emacs-3bbf23bc315e8cf47c459148dad86adeb3e38242.zip
Fix message in help-window-setup (Bug#9341).
* help.el (help-window-setup): Fix message displayed when other window is reused. (Bug#9341)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help.el2
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 @@
12011-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
12011-08-23 Stefan Monnier <monnier@iro.umontreal.ca> 62011-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.