master baade53 1/5: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit baade53cbedd57b3d010b148e25537ceaab8f9c0
Merge: 4fa5bad 302f71e
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    302f71e55d Fix help message with help-window-select
    0fb3fc92b3 Remove obsolete "Wide Characters" section of Gnus manual
---
 doc/misc/gnus.texi | 19 -------------------
 lisp/help.el       |  4 ++--
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 176411a..4a09eac 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -842,7 +842,6 @@ Formatting Variables
 * Formatting Fonts::            Making the formatting look colorful and nice.
 * Positioning Point::           Moving point to a position after an operation.
 * Tabulation::                  Tabulating your output.
-* Wide Characters::             Dealing with wide characters.
 
 Image Enhancements
 
@@ -22635,7 +22634,6 @@ lots of percentages everywhere.
 * Formatting Fonts::            Making the formatting look colorful and nice.
 * Positioning Point::           Moving point to a position after an operation.
 * Tabulation::                  Tabulating your output.
-* Wide Characters::             Dealing with wide characters.
 @end menu
 
 Currently Gnus uses the following formatting variables:
@@ -22890,23 +22888,6 @@ This is the soft tabulator.
 50 will be removed.  This is the hard tabulator.
 
 
-@node Wide Characters
-@subsection Wide Characters
-
-Fixed width fonts in most countries have characters of the same width.
-Some countries, however, use Latin characters mixed with wider
-characters---most notable East Asian countries.
-
-The problem is that when formatting, Gnus assumes that if a string is 10
-characters wide, it'll be 10 Latin characters wide on the screen.  In
-these countries, that's not true.
-
-@vindex gnus-use-correct-string-widths
-To help fix this, you can set @code{gnus-use-correct-string-widths} to
-@code{t}.  This makes buffer generation slower, but the results will be
-prettier.  The default value is @code{nil}.
-
-
 @node Window Layout
 @section Window Layout
 @cindex window layout
diff --git a/lisp/help.el b/lisp/help.el
index 45159d4..729684a 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -178,7 +178,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."))))))))
@@ -1131,7 +1131,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)))))