diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-04-24 15:13:20 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-04-24 15:13:20 +0000 |
| commit | 125a8d7091d604217366dc10e7501b4c8679ce6d (patch) | |
| tree | ba1b038b513044d9ad367caf9b70fa8dbb7509a5 /lisp/help.el | |
| parent | be7a2e73e2957333dadecd9c855f282557f6d3c0 (diff) | |
| download | emacs-125a8d7091d604217366dc10e7501b4c8679ce6d.tar.gz | |
(print-help-return-message): Check same-window-buffer-names
and same-window-regexps.
Diffstat (limited to 'lisp/help.el')
| -rw-r--r-- | lisp/help.el | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/lisp/help.el b/lisp/help.el index 9637c2f4b7a..fb4b01e5aee 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -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." |