From: Stefan Kangas <stefankangas@gmail.com>
Date: Tue, 1 Sep 2020 09:39:22 +0000 (+0200)
Subject: Fix help message with help-window-select
X-Git-Tag: emacs-27.1.90~164
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=302f71e55da427529d3d0d62dd1511552aad9f7b;p=emacs.git

Fix help message with help-window-select

* lisp/help.el (help-print-return-message):
(help-window-display-message): Recommend 'scroll-up-command' instead
of 'scroll-up' when 'help-window-select' is non-nil.  (Bug#43122)
---

diff --git a/lisp/help.el b/lisp/help.el
index 0f1991e3185..c276c1dc280 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -179,7 +179,7 @@ Do not call this in the scope of `with-help-window'."
 		     (if (same-window-p (buffer-name standard-output))
 			 ;; Say how to scroll this window.
 			 (substitute-command-keys
-			  "\\[scroll-up] to scroll the help.")
+                          "\\[scroll-up-command] to scroll the help.")
 		       ;; Say how to scroll some other window.
 		       (substitute-command-keys
 			"\\[scroll-other-window] to scroll the help."))))))))
@@ -1243,7 +1243,7 @@ window."
 	   ".")
 	  ((eq scroll 'other)
 	   ", \\[scroll-other-window] to scroll help.")
-	  (scroll ", \\[scroll-up] to scroll help."))))
+          (scroll ", \\[scroll-up-command] to scroll help."))))
     (message "%s"
      (substitute-command-keys (concat quit-part scroll-part)))))