[Emacs-diffs] Changes to emacs/lisp/help.el

[Eli Zaretskii]

Index: emacs/lisp/help.el
diff -c emacs/lisp/help.el:1.290 emacs/lisp/help.el:1.291
*** emacs/lisp/help.el:1.290    Wed Nov 30 16:09:58 2005
--- emacs/lisp/help.el  Sat Dec  3 11:51:39 2005
***************
*** 111,117 ****
  (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 . quit-window)    do quit-window, then select WINDOW.
   (WINDOW BUF START POINT)  display BUF at START, POINT, then select WINDOW.")
  
--- 111,118 ----
  (defvar help-return-method nil
    "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.
   (WINDOW . quit-window)    do quit-window, then select WINDOW.
   (WINDOW BUF START POINT)  display BUF at START, POINT, then select WINDOW.")
  
***************
*** 119,128 ****
    "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."
    (and (not (get-buffer-window standard-output))
         (let ((first-message
!             (cond ((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.
--- 120,133 ----
    "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.
! 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 ((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.