# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 797796901 0
# Node ID d39d8e8b6d20bc92c40f0dea42adf364c02b3743
# Parent  c4ee56df7173b4d8fb1e40f672ebc12f3d1d2677
(print-help-return-message): Check same-window-buffer-names
and same-window-regexps.

diff -r c4ee56df7173 -r d39d8e8b6d20 lisp/help.el
--- a/lisp/help.el	Thu Apr 13 18:06:46 1995 +0000
+++ b/lisp/help.el	Thu Apr 13 18:15:01 1995 +0000
@@ -190,8 +190,15 @@
 		       (substitute-command-keys first-message)
 		     "")
 		   (if first-message "  " "")
-		   (substitute-command-keys
-		    "\\[scroll-other-window] to scroll the help."))))))
+		   (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)))
+		       (substitute-command-keys
+			"\\[scroll-up] to scroll the help.")
+		     (substitute-command-keys
+		      "\\[scroll-other-window] to scroll the help.")))))))
 
 (defun describe-key (key)
   "Display documentation of the function invoked by KEY.  KEY is a string."