Merge from origin/emacs-30

1f520db97bd * doc/emacs/files.texi (Time Stamp Customization): Typo.
d824b66c242 ; * doc/emacs/search.texi (Isearch Yank): Improve flow.
62b284f9153 ; * etc/DEBUG: Say that debugging code compiled w/ -Og ca...
49ea1f64c77 ; Improve documentation of 'modifier-bar-mode'
a975232c0fd ; * doc/emacs/programs.texi (Matching): Fix wording (bug#...
29142dab316 ; * doc/misc/efaq-w32.texi (MinGW-w64): Fix punctuation (...
4cd4a801d86 ; * java/res/README: Note origin of emacs_wrench.png.

9 files changed, 48 insertions, 35 deletions

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index d0618bf8f9b..85b00567cf0 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2165,6 +2165,10 @@ You can similarly enter the Shift, Control, and Meta modifiers by
 using @kbd{C-x @@ S}, @kbd{C-x @@ c}, and @kbd{C-x @@ m}, respectively,
 although this is rarely needed.
 
+  On graphical terminals, you can enable the Modifier Bar mode, which
+allows simulating the missing modifier keys by clicking a tool-bar
+button.  @xref{Tool Bars}.
+
 @node Function Keys
 @subsection Rebinding Function Keys
 
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 10a643a3787..de6a83b5205 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1093,7 +1093,7 @@ type @kbd{M-x normal-mode} to re-read them.
 Here is another example, with the time stamp inserted into
 the last paragraph of an HTML document.
 Since this template is at the end of the document, not in the first
-eight lines, @code{time-stamp-format} starts with @code{-10/} to tell
+eight lines, @code{time-stamp-pattern} starts with @code{-10/} to tell
 @code{time-stamp} to look at the last 10 lines.
 The @code{%%} asks for the default format
 (specified by @code{time-stamp-format}).
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 1fa6e0b5b33..c2451e87715 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1346,15 +1346,18 @@ displayed by moving the mouse pointer to the top of the screen.
 @cindex displaying modifier keys in the tool bar
 @cindex mode, Modifier Bar
 @cindex Modifier Bar
-  Keyboards often lack one or more of the modifier keys that Emacs
-might want to use, making it difficult or impossible to input key
-sequences that contain them.  Emacs can optionally display a list of
-buttons that act as substitutes for modifier keys within the tool bar;
-these buttons are also referred to as the ``modifier bar''.  Clicking
-an icon within the modifier bar will cause a modifier key to be
-applied to the next keyboard event that is read.  The modifier bar is
-displayed when the global minor mode @code{modifier-bar-mode} is
-enabled; to do so, type @kbd{M-x modifier-bar-mode}.
+  Keyboards often lack one or more of the modifier keys (@pxref{Modifier
+Keys}) that Emacs users might want to use, making it difficult or
+impossible to input key sequences with these modifiers.  For example,
+many keyboards lack the Hyper and Super modifiers, and smartphones
+usually also lack Ctrl and Alt modifiers.  Emacs can optionally display
+a tool bar of buttons that can substitute the modifier keys; this
+additional tool bar is known as the @dfn{modifier bar}.  Clicking a
+button within the modifier bar will cause the modifier key shown on the
+button to be applied to the next keyboard event that Emacs reads.  The
+modifier bar is displayed when the global minor mode
+@code{modifier-bar-mode} is enabled; to do so, type @kbd{M-x
+modifier-bar-mode}.
 
 @node Tab Bars
 @section Tab Bars
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index c34aeac0d24..f3cdc1b8e6c 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -958,11 +958,11 @@ argument specifies the number of levels to go down.
 
 @node Matching
 @subsection Matching Parentheses
-@cindex matching parentheses
+@cindex matching, parentheses and other paired delimiters
 @cindex parentheses, displaying matches
 
-  Emacs has a number of @dfn{parenthesis matching} features, which
-make it easy to see how and whether parentheses (or other delimiters)
+  Emacs has a number of @dfn{parenthesis matching} features, which make
+it easy to see how and whether parentheses (or other paired delimiters)
 match up.
 
   Whenever you type a self-inserting character that is a closing
@@ -1063,16 +1063,17 @@ nonblank line.
 @findex electric-pair-mode
   Electric Pair mode, a global minor mode, provides a way to easily
 insert matching delimiters: parentheses, braces, brackets, etc.
-Whenever you insert an opening delimiter, the matching closing
-delimiter is automatically inserted as well, leaving point between the
-two.  Conversely, when you insert a closing delimiter over an existing
-one, no insertion takes places, and that position is simply skipped
-over.  If the region is active (@pxref{Mark}), insertion of a
-delimiter operates on the region: the characters in the region are
-enclosed in a pair of matching delimiters, leaving point after the
-delimiter you typed.  If you provide a prefix argument when inserting
-a delimiter, the numeric value of that prefix argument specifies the
-number of pairs to insert.
+Whenever you insert an opening delimiter, the matching closing delimiter
+is automatically inserted as well, leaving point between the two.
+However, if you insert a closing delimiter where one already exists
+(probably a mistake, since typing the opening delimiter inserted the
+closing one for you), Emacs simply moves point to after the closing
+delimiter, skipping the insertion.  If the region is active
+(@pxref{Mark}), insertion of a delimiter operates on the region: the
+characters in the region are enclosed in a pair of matching delimiters,
+leaving point after the delimiter you typed.  If you provide a prefix
+argument when inserting a delimiter, the numeric value of that prefix
+argument specifies the number of pairs to insert.
 
 These variables control additional features of Electric Pair mode:
 
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index c9b1bdfc8bd..788d91f78ba 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -341,7 +341,7 @@ down-casing.
 @kindex M-s M-.
 @findex isearch-forward-thing-at-point
   To begin a new incremental search with the text near point yanked
-into the initial search string, type @kbd{M-s M-.} that runs the
+into the initial search string, type @kbd{M-s M-.}, which runs the
 command @code{isearch-forward-thing-at-point}.  If the region was
 active, then it yanks the text from the region into the search string.
 Otherwise, it tries to yank a URL, a symbol or an expression found
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index 4e409261cd9..766acb0f3ca 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -2157,7 +2157,7 @@ MSYS2 is an independent rewrite of MSYS, based on modern Cygwin and
 MinGW-w64 with the aim of better interoperability with native Windows
 software.  It plays the same role MSYS does in MinGW.  Being a
 distribution, MSYS2 provides tools to build software as well as more
-than 2.600 precompiled packages ready for use.
+than 2600 precompiled packages ready for use.
 
 @node EZWinPorts
 @section EZWinPorts
diff --git a/etc/DEBUG b/etc/DEBUG
index 5409be95a7f..774c1a5812d 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -19,11 +19,11 @@ such as --prefix):
   ./configure --enable-checking='yes,glyphs' --enable-check-lisp-object-type \
     CFLAGS='-O0 -g3'
 
-The -O0 flag is important, as debugging optimized code can be hard.
-If the problem happens only with optimized code, you may need to
-enable optimizations.  If that happens, try using -Og first instead of
--O2, as -Og disables some optimizations that make debugging some code
-exceptionally hard.
+The -O0 flag is important, as debugging optimized code can be hard, even
+in the case that the -Og compiler option is used.  If the problem
+happens only with optimized code, you may need to enable optimizations.
+If that happens, try using -Og first instead of -O2, as -Og disables
+some optimizations that make debugging some code exceptionally hard.
 
 Older versions of GCC may need more than just the -g3 flag.  For more,
 search for "analyze failed assertions" below.
diff --git a/java/res/README b/java/res/README
new file mode 100644
index 00000000000..38f3f232033
--- /dev/null
+++ b/java/res/README
@@ -0,0 +1,4 @@
+* The wrench icon that is superimposed on Emacs's own icon in
+  drawable/emacs_wrench.png was released into the Public Domain by the
+  Tango Desktop Project.
+  <https://web.archive.org/web/20230207074050/https://tango.freedesktop.org/Tango_Desktop_Project>
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 8f55af155b9..23e3dc0dfd3 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -532,12 +532,13 @@ decoding the current key sequence, nil otherwise."
   (not (memq modifier modifier-bar-modifier-list)))
 
 (define-minor-mode modifier-bar-mode
-  "Toggle display of the modifier bar.
+  "Toggle display of the key-modifier tool bar.
 
-When enabled, a small tool bar will be displayed next to the tool
-bar containing items bound to
-`tool-bar-event-apply-control-modifier' and its related commands,
-which see."
+When enabled, a small tool bar will be displayed in addition to the
+regular tool bar, containing buttons for key modifiers such as
+Ctrl, Shift, Alt, etc.  This is useful on terminals whose keyboard
+has no keys for these modifiers, such as smartphones and other
+devices with small keyboards."
   :init-value nil
   :global t
   :group 'tool-bar