Commit 125a8d70 authored by Richard M. Stallman's avatar Richard M. Stallman

(print-help-return-message): Check same-window-buffer-names

and same-window-regexps.
parent be7a2e73
......@@ -190,15 +190,25 @@ If FUNCTION is nil, applies `message' to it, thus printing it."
(substitute-command-keys first-message)
"")
(if first-message " " "")
;; If the help buffer will go in a separate frame,
;; it's no use mentioning a command to scroll, so don't.
(if (or (member (buffer-name standard-output)
same-window-buffer-names)
special-display-buffer-names)
(memq t (mapcar '(lambda (elt)
(string-match elt (buffer-name standard-output)))
same-window-regexps)))
special-display-regexps)))
nil
(if (or (member (buffer-name standard-output)
same-window-buffer-names)
(memq t (mapcar '(lambda (elt)
(string-match elt (buffer-name standard-output)))
same-window-regexps)))
;; Say how to scroll this window.
(substitute-command-keys
"\\[scroll-up] to scroll the help.")
;; Say how to scroll some other window.
(substitute-command-keys
"\\[scroll-up] to scroll the help.")
(substitute-command-keys
"\\[scroll-other-window] to scroll the help.")))))))
"\\[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