Merge from savannah/emacs-30

01d4eb3dd42 ; Improve doc string of 'insert-char'
93ad8407ed8 * admin/notes/emba: Fix docker build instruction.
b901290ae7f * doc/lispref/text.texi (Margins): Grammar fix.
16855c89dde Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/...
8792d3431b1 Backport: Fix tree-sitter tests on Emba

# Conflicts:
#	test/infra/Dockerfile.emba

5 files changed, 13 insertions, 8 deletions

diff --git a/admin/notes/emba b/admin/notes/emba
index 2d0aaa6e8f0..cf4184ccc92 100644
--- a/admin/notes/emba
+++ b/admin/notes/emba
@@ -91,7 +91,7 @@ emba.gnu.org:5050, is not accessible publicly.  Instead, the container
 images must be build locally.  Change the current directory to a
 recent Emacs branch (not a worktree), and apply the command
 
-  docker build --target emacs-inotify --tag emacs-inotify \
+  docker buildx build --target emacs-inotify --tag emacs-inotify \
     -f test/infra/Dockerfile.emba .
 
 This creates the Debian-based image emacs-inotify, based on the
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index a20699d1944..75b2b1c3d60 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1932,7 +1932,7 @@ they default to the whole buffer.
 This function adjusts the indentation at the beginning of the current
 line to the value specified by the variable @code{left-margin}.  (That
 may involve either inserting or deleting whitespace.)  This function
-is value of @code{indent-line-function} in Paragraph-Indent Text mode.
+is the value of @code{indent-line-function} in Paragraph-Indent Text mode.
 @end defun
 
 @defopt left-margin
diff --git a/src/editfns.c b/src/editfns.c
index a938d094534..c4f23ccbe5b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1440,8 +1440,9 @@ DEFUN ("insert-char", Finsert_char, Sinsert_char, 1, 3,
               (prefix-numeric-value current-prefix-arg)\
               t))",
        doc: /* Insert COUNT copies of CHARACTER.
+
 Interactively, prompt for CHARACTER using `read-char-by-name'.
-You can specify CHARACTER in one of these ways:
+You can specify CHARACTER at the prompt in one of these ways:
 
  - As its Unicode character name, e.g. \"LATIN SMALL LETTER A\".
    Completion is available; if you type a substring of the name
@@ -1455,14 +1456,18 @@ You can specify CHARACTER in one of these ways:
  - As a code point with a radix specified with #, e.g. #o21430
    (octal), #x2318 (hex), or #10r8984 (decimal).
 
-If called interactively, COUNT is given by the prefix argument.  If
-omitted or nil, it defaults to 1.
+When called from Lisp, CHARACTER should be an integer whose value
+is valid for a character; see `characterp'.  To specify a character by
+its Unicode name in calls from Lisp, use `char-from-name'.
+
+When called interactively, COUNT is the prefix argument.  If omitted or
+nil, it defaults to 1.
 
 Inserting the character(s) relocates point and before-insertion
 markers in the same ways as the function `insert'.
 
 The optional third argument INHERIT, if non-nil, says to inherit text
-properties from adjoining text, if those properties are sticky.  If
+properties from adjoining text, if those properties are sticky.  When
 called interactively, INHERIT is t.  */)
   (Lisp_Object character, Lisp_Object count, Lisp_Object inherit)
 {
diff --git a/test/lisp/emacs-lisp/cl-macs-tests.el b/test/lisp/emacs-lisp/cl-macs-tests.el
index 3e3279ee35a..ade5b62d05a 100644
--- a/test/lisp/emacs-lisp/cl-macs-tests.el
+++ b/test/lisp/emacs-lisp/cl-macs-tests.el
@@ -556,7 +556,7 @@ collection clause."
       (should (= def 4)))
     (should (= 4 (mystruct-def x)))
     (should (= 1 (mystruct-abc x)))))
- 
+
 (ert-deftest cl-lib-arglist-performance ()
   ;; An `&aux' should not cause lambda's arglist to be turned into an &rest
   ;; that's parsed by hand.
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