master b8e6bea: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit b8e6beaab01e9c7eaf5cdc12a34987402fb9b72f
Merge: 855f1bd 3607508
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    3607508f3f Set calc-make-windows-dedicated to nil by default
    9de8eec3bc * make-dist: Don't run "make --question info".  (Bug#52322)
    cea8deea72 ; * src/xdisp.c (move_it_vertically_backward): Clarify com...
    6170c5036e Fix regression in help-mode prompt
    
    # Conflicts:
    #   etc/NEWS
---
 etc/NEWS.28        |  6 +++---
 lisp/calc/calc.el  |  2 +-
 lisp/help-macro.el |  8 ++++++--
 make-dist          |  7 -------
 src/xdisp.c        | 11 ++++++-----
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/etc/NEWS.28 b/etc/NEWS.28
index eb65213..d2565e5 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -1588,9 +1588,9 @@ and the result is not truncated in any way.
 It no longer has lower precedence than '+' and '-'.
 
 ---
-*** Calc now marks its windows dedicated.
-The new user option 'calc-make-windows-dedicated' controls this.  It
-is t by default; set to nil to get back the old behavior.
+*** New user option 'calc-make-windows-dedicated'.
+When this user option is non-nil, Calc will mark its windows as
+dedicated.
 
 ** Calendar
 
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 9774ddf..d426e28 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1423,7 +1423,7 @@ commands given here will actually operate on the 
*Calculator* stack."
     (require 'calc-ext)
     (calc-set-language calc-language calc-language-option t)))
 
-(defcustom calc-make-windows-dedicated t
+(defcustom calc-make-windows-dedicated nil
   "If non-nil, windows displaying Calc buffers will be marked dedicated.
 See `window-dedicated-p' for what that means."
   :version "28.1"
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index cd1b51e..ecc7eba 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -167,14 +167,18 @@ and then returns."
                    (let ((cursor-in-echo-area t)
                          (overriding-local-map local-map))
                      (setq key (read-key-sequence
-                                (format "Type one of the options listed%s: "
+                                (format "Type one of listed options%s: "
                                         (if (pos-visible-in-window-p
                                              (point-max))
                                             ""
                                           (concat  ", or "
                                                    
(help--key-description-fontified (kbd "<PageDown>"))
-                                                   " or "
+                                                   "/"
                                                    
(help--key-description-fontified (kbd "<PageUp>"))
+                                                   "/"
+                                                   
(help--key-description-fontified (kbd "SPC"))
+                                                   "/"
+                                                   
(help--key-description-fontified (kbd "DEL"))
                                                    " to scroll"))))
                            char (aref key 0)))
 
diff --git a/make-dist b/make-dist
index b069130..db7a74b 100755
--- a/make-dist
+++ b/make-dist
@@ -299,13 +299,6 @@ if [ $check = yes ]; then
     echo "${bogosities}"
   fi
 
-  ## This exits with non-zero status if any .info files need
-  ## rebuilding.
-  if [ -r Makefile ] && [ "$with_info" = "yes" ]; then
-      echo "Checking to see if info files are up-to-date..."
-      make --question info || error=yes
-  fi
-
   ## Is this a release?
   case $version in
       [1-9][0-9].[0-9])
diff --git a/src/xdisp.c b/src/xdisp.c
index 89b2959..5e549c9 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10423,11 +10423,12 @@ move_it_to (struct it *it, ptrdiff_t to_charpos, int 
to_x, int to_y, int to_vpos
 
 /* Move iterator IT backward by a specified y-distance DY, DY >= 0.
 
-   If DY > 0, move IT backward at least that many pixels.  DY = 0
-   means move IT backward to the preceding line start or BEGV.  This
-   function may move over more than DY pixels if IT->current_y - DY
-   ends up in the middle of a line; in this case IT->current_y will be
-   set to the top of the line moved to.  */
+   If DY > 0, move IT backward that many pixels.
+   DY = 0 means move IT backward to the preceding line start or to BEGV.
+   This function may move over less or more than DY pixels if
+   IT->current_y - DY ends up in the middle of a line; in this case
+   IT->current_y will be set to the top of the line either before or
+   after the exact pixel coordinate.  */
 
 void
 move_it_vertically_backward (struct it *it, int dy)