summaryrefslogtreecommitdiff
path: root/lisp/help.el
diff options
context:
space:
mode:
authorKenichi Handa <handa@etlken>2010-04-07 15:08:27 +0900
committerKenichi Handa <handa@etlken>2010-04-07 15:08:27 +0900
commit64e692b56e84153d45b2c46d833dce14243f7c69 (patch)
treedb049db5995f5cfcba3db28dfeb305ef5e04157c /lisp/help.el
parent86a366f4015868f03bc8399b412ea767e9337072 (diff)
parente59c4233e20bfb2b8b50c77a42023a2473405391 (diff)
downloademacs-64e692b56e84153d45b2c46d833dce14243f7c69.tar.gz
merge trunk
Diffstat (limited to 'lisp/help.el')
-rw-r--r--lisp/help.el7
1 files changed, 3 insertions, 4 deletions
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