Merge from origin/emacs-30

defc55bb6f9 Fix treesit-parser-create behavior regarding indirect buf...
20ac26e6751 ; Fix with-delayed-message docstring metavars.
04034cd9ce7 Fix 'dired-movement-style' in Dired when subdirs are shown
f8443dffc1f ; * lisp/register.el (register-use-preview): Doc fix (bug...
f729828bcfb ; Add texinfo reference to GNU Coding Standards.
a6abb88fdcc ; * lisp/files.el (executable-find): Doc fix.

# Conflicts:
#	src/treesit.c

6 files changed, 18 insertions, 13 deletions

diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 2211369b121..45f15c7dd0d 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1494,9 +1494,10 @@ the Emacs Lisp Reference Manual
 @subsection Coding Standards
 @cindex coding standards for Emacs submissions
 
-Contributed code should follow the GNU Coding Standards
-@url{https://www.gnu.org/prep/standards/}.  This may also be available
-in info on your system.
+Contributed code should follow the GNU Coding Standards.  This manual
+is available online at @url{https://www.gnu.org/prep/standards/}.  It
+may also be available locally in Info on your system, see @pxref{Top,,,
+standards, GNU Coding Standards}.
 
 If it doesn't, we'll need to find someone to fix the code before we
 can use it.
diff --git a/lisp/dired.el b/lisp/dired.el
index 24d76ae79be..68e1da13171 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2935,15 +2935,19 @@ is controlled by `dired-movement-style'."
           (setq wrapped t))
          ;; `bounded': go back to the last non-empty line.
          (dired-movement-style ; Either 'bounded or anything else non-nil.
-          (while (and (dired-between-files) (not (zerop arg)))
+          (while (and (dired-between-files)
+                      (not (dired-get-subdir))
+                      (not (zerop arg)))
             (funcall jumpfun (- moving-down))
             ;; Point not moving means infinite loop.
             (if (= old-position (point))
                 (setq arg 0)
               (setq old-position (point))))
           ;; Encountered a boundary, so let's stop movement.
-          (setq arg (if (dired-between-files) 0 moving-down)))))
-      (unless (dired-between-files)
+          (setq arg (if (and (dired-between-files)
+                             (not (dired-get-subdir)))
+                        0 moving-down)))))
+      (unless (and (dired-between-files) (not (dired-get-subdir)))
         ;; Has moved to a non-empty line.  This movement does
         ;; make sense.
         (decf arg moving-down))
diff --git a/lisp/files.el b/lisp/files.el
index 6ae4d764f63..f85021f0d69 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1310,9 +1310,9 @@ the value of the variable `exec-path'."
 
 (defun executable-find (command &optional remote)
   "Search for COMMAND in `exec-path' and return the absolute file name.
-Return nil if COMMAND is not found anywhere in `exec-path'.  If
-REMOTE is non-nil, search on the remote host indicated by
-`default-directory' instead."
+Return nil if COMMAND is not found anywhere in `exec-path'.
+If REMOTE is non-nil, search on a remote host if `default-directory' is
+remote, otherwise search locally."
   (if (and remote (file-remote-p default-directory))
       (let ((res (locate-file
                   command
diff --git a/lisp/register.el b/lisp/register.el
index 00f8caba67a..ad2abf7e4ea 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -130,11 +130,11 @@ description of the argument.  The function to use is set according
 to the value of `register--read-with-preview-function'.")
 
 (defcustom register-use-preview 'traditional
-  "Whether to show register preview when modifying registers.
+  "Whether register commands show preview of registers with non-nil values.
 
 When set to t, show a preview buffer with navigation and highlighting.
 
-When set `insist', behave as with t, but allow exiting the minibuffer by
+When set to `insist', behave as with t, but allow exiting the minibuffer by
 pressing the register name a second time.  For example, press \\`a' to
 select register \"a\", then press \\`a' again to exit the minibuffer.
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 689f6c362a9..10b7da3535b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -7451,7 +7451,7 @@ not a list, return a one-element list containing OBJECT."
 The MESSAGE form will be evaluated immediately, but the resulting
 string will be displayed only if BODY takes longer than TIMEOUT seconds.
 
-\(fn (timeout message) &rest body)"
+\(fn (TIMEOUT MESSAGE) &rest BODY)"
   (declare (indent 1))
   `(funcall-with-delayed-message ,(car args) ,(cadr args)
                                  (lambda ()
diff --git a/test/lisp/vc/diff-mode-resources/git.patch b/test/lisp/vc/diff-mode-resources/git.patch
index 05ec90d105c..fdb586d37d3 100644
--- a/test/lisp/vc/diff-mode-resources/git.patch
+++ b/test/lisp/vc/diff-mode-resources/git.patch
@@ -47,5 +47,5 @@ index 9f6c5fe43e47eab441232e54456c5c2b06297b65..7b3f91a8b4ed923c8f43183276e3ab36
  if __name__ == "__main__":
      main()
 
--- 
+--
 2.40.0