Commit d536293f authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(print-help-return-message): If help buffer is a

special display buffer, say nothing about how to switch back.
parent 7f410bb7
......@@ -136,16 +136,40 @@
Computes a message and applies the optional argument FUNCTION to it.
If FUNCTION is nil, applies `message' to it, thus printing it."
(and (not (get-buffer-window standard-output))
(funcall (or function 'message)
(if (one-window-p t)
(if pop-up-windows
"Type \\[delete-other-windows] to remove help window."
"Type \\[switch-to-buffer] RET to remove help window.")
"Type \\[switch-to-buffer-other-window] RET to restore the other window."))
" \\[scroll-other-window] to scroll the help.")))))
(let ((first-message
(cond ((or (member (buffer-name standard-output)
(let (found
(tail special-display-regexps)
(name (buffer-name standard-output)))
(while (and tail (not found))
(if (string-match (car tail) name)
(setq found t))
(setq tail (cdr tail)))
;; If the help output buffer is a special display buffer,
;; don't say anything about how to get rid of it.
;; First of all, the user will do that with the window
;; manager, not with Emacs.
;; Secondly, the buffer has not been displayed yet,
;; so we don't know whether its frame will be selected.
;; Even the message about scrolling the help
;; might be wrong, but it seems worth showing it anyway.
((not (one-window-p t))
"Type \\[switch-to-buffer-other-window] RET to restore the other window.")
"Type \\[delete-other-windows] to remove help window.")
"Type \\[switch-to-buffer] RET to remove help window."))))
(funcall (or function 'message)
(if first-message
(substitute-command-keys first-message)
(if first-message " " "")
"\\[scroll-other-window] to scroll the help."))))))
(defun describe-key (key)
"Display documentation of the function invoked by KEY. KEY is a string."
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment