aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-04-03 19:40:20 -0400
committerChong Yidong2010-04-03 19:40:20 -0400
commit6baa27a2b2525ac7dee5fb425f1ac26ece0c0e0d (patch)
tree236d2ad4137b87104d06ebbedab5fd03205e0103
parent6f5b06547bade0b1c146795b84ca15d7ee8ad2a6 (diff)
downloademacs-6baa27a2b2525ac7dee5fb425f1ac26ece0c0e0d.tar.gz
emacs-6baa27a2b2525ac7dee5fb425f1ac26ece0c0e0d.zip
* help.el (help-window-setup-finish): Doc fix (Bug#5830).
Reported by monkey@sandpframing.com.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/help.el7
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 911e447129f..ee9c8997b83 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-04-03 Chong Yidong <cyd@stupidchicken.com>
2
3 * help.el (help-window-setup-finish): Doc fix (Bug#5830).
4 Reported by monkey@sandpframing.com.
5
12010-04-02 Juanma Barranquero <lekktu@gmail.com> 62010-04-02 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * cedet/semantic/imenu.el (semantic-imenu-bucketize-type-members) 8 * cedet/semantic/imenu.el (semantic-imenu-bucketize-type-members)
diff --git a/lisp/help.el b/lisp/help.el
index 9fb993e7173..0c231a78b91 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1046,10 +1046,9 @@ scroll the \"other\" window."
1046Select WINDOW according to the value of `help-window-select'. 1046Select WINDOW according to the value of `help-window-select'.
1047Display message telling how to scroll and eventually quit WINDOW. 1047Display message telling how to scroll and eventually quit WINDOW.
1048 1048
1049Optional argument REUSE non-nil means WINDOW has been reused \(by 1049Optional argument REUSE non-nil means WINDOW has been reused by
1050`display-buffer'\) for displaying help. Optional argument 1050`display-buffer'. Optional argument KEEP-FRAME non-nil means
1051KEEP-FRAME non-nil means that quitting must no delete the frame 1051that quitting should not delete WINDOW's frame."
1052of WINDOW."
1053 (let ((number-of-windows 1052 (let ((number-of-windows
1054 (length (window-list (window-frame window) 'no-mini window)))) 1053 (length (window-list (window-frame window) 'no-mini window))))
1055 (cond 1054 (cond