diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-03 16:03:38 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-03 16:03:38 -0700 |
| commit | b49e353d9d01adbe60bc5d0b1658b4ef978b0b06 (patch) | |
| tree | 9f2ffa6f7a6562abf661a4951012b488ad8b1ae7 /lisp/help.el | |
| parent | 74b880cbc18bd0194c7b1fc44c4a983ee05adae2 (diff) | |
| parent | bc3200871917d5c54c8c4299a06bf8f8ba2ea02d (diff) | |
| download | emacs-b49e353d9d01adbe60bc5d0b1658b4ef978b0b06.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/help.el')
| -rw-r--r-- | lisp/help.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/help.el b/lisp/help.el index e6496f625d1..3ed6f79275a 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -132,7 +132,7 @@ "What to do to \"exit\" the help buffer. This is a list (WINDOW . t) delete the selected window (and possibly its frame, - see `quit-window' and `View-quit'), go to WINDOW. + see `quit-window'), go to WINDOW. (WINDOW . quit-window) do quit-window, then select WINDOW. (WINDOW BUF START POINT) display BUF at START, POINT, then select WINDOW.") @@ -1104,7 +1104,7 @@ This relies on `display-buffer-window' being correctly set up by ((eq help-value 'new-window) "Type \\[delete-other-windows] to delete the help window") ((eq help-value 'reuse-other-window) - "Type \\[switch-to-prev-buffer] RET to restore previous buffer")) + "Type \"q\" in other window to quit")) help-window 'other)) (t ;; Not much to say here. |