diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-19 11:07:52 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-04-19 11:07:52 -0400 |
| commit | 6e104790e756226cbb5b7feaf01854103ded9f36 (patch) | |
| tree | 5a1bd758627d6358a7083bb3d72108676bde8bdb /lisp/help.el | |
| parent | b5feea0feaf721c66ff34ee2728c76a4c028fa0f (diff) | |
| parent | 79d74ac527b79242175bca1b39ef12b1693c3523 (diff) | |
| download | emacs-6e104790e756226cbb5b7feaf01854103ded9f36.tar.gz emacs-6e104790e756226cbb5b7feaf01854103ded9f36.tar.bz2 emacs-6e104790e756226cbb5b7feaf01854103ded9f36.zip | |
Merge from emacs-23
Diffstat (limited to 'lisp/help.el')
| -rw-r--r-- | lisp/help.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/help.el b/lisp/help.el index 5e4c4ebaf61..899547aa0a1 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1048,10 +1048,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 |