diff options
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/help.el | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d9deff1cdea..687b89d3906 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2005-12-03 Eli Zaretskii <eliz@gnu.org> + + * help.el (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. + 2005-12-03 Martin Rudalics <rudalics@gmx.at> (tiny change) * emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression): Fix bug diff --git a/lisp/help.el b/lisp/help.el index cd95af0e866..067e02d5cef 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -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 @@ This is a list "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. |