Mercurial > emacs
changeset 67279:8cf27ba1d450
(print-help-return-message): If pop-up-frames is non-nil, set up
help-return-method to delete the help window and, possibly, its frame as well. Doc fix.
(help-return-method): Doc fix.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 03 Dec 2005 11:51:39 +0000 |
| parents | cf00aa89f148 |
| children | 80bbfbaf5e38 |
| files | lisp/help.el |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/help.el Sat Dec 03 11:04:17 2005 +0000 +++ b/lisp/help.el Sat Dec 03 11:51:39 2005 +0000 @@ -111,7 +111,8 @@ (defvar help-return-method nil "What to do to \"exit\" the help buffer. This is a list - (WINDOW . t) delete the selected window, go to WINDOW. + (WINDOW . t) delete the selected window (and possibly its frame, + see `quit-window' and `View-quit'), go to WINDOW. (WINDOW . quit-window) do quit-window, then select WINDOW. (WINDOW BUF START POINT) display BUF at START, POINT, then select WINDOW.") @@ -119,10 +120,14 @@ "Display or return message saying how to restore windows after help command. This function assumes that `standard-output' is the help buffer. It computes a message, and applies the optional argument FUNCTION to it. -If FUNCTION is nil, it applies `message', thus displaying the message." +If FUNCTION is nil, it applies `message', thus displaying the message. +In addition, this function sets up `help-return-method', which see, that +specifies what to do when the user exits the help buffer." (and (not (get-buffer-window standard-output)) (let ((first-message - (cond ((special-display-p (buffer-name standard-output)) + (cond ((or + pop-up-frames + (special-display-p (buffer-name standard-output))) (setq help-return-method (cons (selected-window) t)) ;; If the help output buffer is a special display buffer, ;; don't say anything about how to get rid of it.