mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-23

Browse source
This commit is contained in:
Stefan Monnier 2010-04-19 11:07:52 -04:00
commit 6e104790e7
48 changed files with 735 additions and 219 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/help.el
View file

@ -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