diff options
| author | Chong Yidong | 2010-04-03 19:40:20 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-04-03 19:40:20 -0400 |
| commit | 6baa27a2b2525ac7dee5fb425f1ac26ece0c0e0d (patch) | |
| tree | 236d2ad4137b87104d06ebbedab5fd03205e0103 | |
| parent | 6f5b06547bade0b1c146795b84ca15d7ee8ad2a6 (diff) | |
| download | emacs-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/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/help.el | 7 |
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 @@ | |||
| 1 | 2010-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 | |||
| 1 | 2010-04-02 Juanma Barranquero <lekktu@gmail.com> | 6 | 2010-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." | |||
| 1046 | Select WINDOW according to the value of `help-window-select'. | 1046 | Select WINDOW according to the value of `help-window-select'. |
| 1047 | Display message telling how to scroll and eventually quit WINDOW. | 1047 | Display message telling how to scroll and eventually quit WINDOW. |
| 1048 | 1048 | ||
| 1049 | Optional argument REUSE non-nil means WINDOW has been reused \(by | 1049 | Optional 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 |
| 1051 | KEEP-FRAME non-nil means that quitting must no delete the frame | 1051 | that quitting should not delete WINDOW's frame." |
| 1052 | of 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 |