summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-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 @@
+2010-04-03 Chong Yidong <cyd@stupidchicken.com>
+
+ * help.el (help-window-setup-finish): Doc fix (Bug#5830).
+ Reported by monkey@sandpframing.com.
+
2010-04-02 Juanma Barranquero <lekktu@gmail.com>
* 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."
Select WINDOW according to the value of `help-window-select'.
Display message telling how to scroll and eventually quit WINDOW.
-Optional argument REUSE non-nil means WINDOW has been reused \(by
-`display-buffer'\) for displaying help. Optional argument
-KEEP-FRAME non-nil means that quitting must no delete the frame
-of WINDOW."
+Optional argument REUSE non-nil means WINDOW has been reused by
+`display-buffer'. Optional argument KEEP-FRAME non-nil means
+that quitting should not delete WINDOW's frame."
(let ((number-of-windows
(length (window-list (window-frame window) 'no-mini window))))
(cond