Merge from origin/emacs-30

b420e149b1e Fix a typo in ediff-init.el
e1304e9b1bb Fix 'chart-space-usage' on MS-Windows
04c44405bf6 Fix alignment and documentation of vtable.el
4d6fadb8d21 ; * lisp/which-key.el: Fix ':package-version' (bug#73072).
54071b9cef2 ; Improve doc strings of 'tab-bar-mode' and 'tab-line-mode'
87a8b12a0c4 Fix test failure in erc-networks-tests
dad0935cfcb ; * doc/emacs/building.texi (Lisp Libraries): Update (bug...
e4dc6711b02 Fix :hook in 'use-package'
c1cd036d27a ; * doc/lispref/modes.texi (Mode Line Data): Fox wording.
ae2463796f2 ; Caveats about using :eval in 'mode-line-format'
4047072c7d8 Update FSF's address
24f12bdd77e Support the new option in ruby-ts-mode too
6c15b7710d4 Add new option ruby-bracketed-args-indent
7799ef43354 Fix Rmail base64 and qp decoding of MIME payloads
0def396fa8f Update to Org 9.7.11
8c044bd9726 ; Fix recent changes in documentation
e0d8879bcd5 * test/lisp/emacs-lisp/tabulated-list-tests.el: Add missi...
4ff4b78f922 ; Small doc fixes
da980ad838e ; Reword some "allows Xing"
2ca7d5649c6 ; More accurate text about how `equal` compares various o...

# Conflicts:
#	etc/NEWS

15 files changed, 60 insertions, 40 deletions

diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi
index 97110dc8cdb..f64dd104f60 100644
--- a/doc/emacs/anti.texi
+++ b/doc/emacs/anti.texi
@@ -71,7 +71,7 @@ tool bars on the bottom.  For the same reasons @code{modifier-bar-mode}
 is now gone.
 
 @item
-The command @code{recover-file} no longer allows displaying the diffs
+The command @code{recover-file} no longer lets you display the diffs
 between a file and its auto-save file.  You either want to recover a
 file or you don't; confusing users with a third alternative when they
 are anxious already by the possibility of losing precious edits is
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 1b079c2cef9..bb03d8cf325 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -1689,9 +1689,9 @@ command or function is invoked.  For example:
 
   Note that installing a package using @code{package-install}
 (@pxref{Package Installation}) takes care of placing the package's
-Lisp files in a directory where Emacs will find it, and also writes
-the necessary initialization code into your init files, making the
-above manual customizations unnecessary.
+Lisp files in a directory where Emacs will find it, and also extends
+@code{load-path} as needed, making the above manual customizations
+unnecessary for such packages.
 
 @node Lisp Eval
 @section Evaluating Emacs Lisp Expressions
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index cf57350743f..88638190d7f 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -816,9 +816,9 @@ Like the other commands in this section, this command operates on the
 @findex dired-do-open
 @kindex E @r{(Dired)}
 @item E
-``Open'' the specified files using an external program.  The program is
-selected according to the system conventions, as determined by the
-variable @code{shell-command-guess-open}.
+``Open'' the specified files using an external program (@code{dired-do-open}).
+The program is selected according to the system conventions, as
+determined by the variable @code{shell-command-guess-open}.
 
 @findex dired-do-rename
 @kindex R @r{(Dired)}
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index fc22e8d7296..5932af301f9 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -89,8 +89,8 @@ developing GNU and promoting software freedom.''
 
 @sp 2
 Published by the Free Software Foundation @*
-51 Franklin Street, Fifth Floor @*
-Boston, MA 02110-1301 USA @*
+31 Milk Street, # 960789 @*
+Boston, MA 02196 @*
 ISBN 978-0-9831592-8-5
 
 @sp 2
@@ -1432,8 +1432,8 @@ If you need to contact the Free Software Foundation, see
 
 @display
 Free Software Foundation
-51 Franklin Street, Fifth Floor
-Boston, MA 02110-1301
+31 Milk Street # 960789
+Boston, MA 02196
 USA
 @end display
 
diff --git a/doc/emacs/mini.texi b/doc/emacs/mini.texi
index 6b604412e88..8a13cabb837 100644
--- a/doc/emacs/mini.texi
+++ b/doc/emacs/mini.texi
@@ -711,10 +711,11 @@ completions list buffer, and the second one will switch to it.
   When the window showing the completions is selected, either because
 you customized @code{completion-auto-select} or because you switched to
 it by typing @kbd{C-x o}, the @kbd{@key{UP}} and @kbd{@key{DOWN}} arrow
-keys move by lines between completion candidates; with a prefix numeric
-argument, they move that many lines.  If @code{completion-auto-wrap} is
-non-@code{nil}, these commands will wrap at bottom and top of the
-candidate list.
+keys (@code{previous-line-completion} and @code{next-line-completion},
+respectively) move by lines between completion candidates; with a prefix
+numeric argument, they move that many lines.  If
+@code{completion-auto-wrap} is non-@code{nil}, these commands will wrap
+at bottom and top of the candidate list.
 
 @vindex completion-cycle-threshold
   If @code{completion-cycle-threshold} is non-@code{nil}, completion
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 3b863eefd72..42b57143bf1 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1430,7 +1430,7 @@ line shows how many manual pages are available.
 @vindex Man-prefer-synchronous-call
   By default, @kbd{M-x man} calls the @code{man} program
 asynchronously.  You can force the invocation to be synchronous by
-customizing @code{Man-prefer-synchronous-calls} to a non-@code{nil}
+customizing @code{Man-prefer-synchronous-call} to a non-@code{nil}
 value.
 
 @vindex Man-support-remote-systems
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index bc4dc31bf4c..49916235fbf 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -125,8 +125,8 @@ Published by the:@*
 GNU Press,               @hfill @uref{https://www.fsf.org/licensing/gnu-press/}@*
 a division of the               @hfill email: @email{sales@@fsf.org}@*
 Free Software Foundation, Inc.  @hfill Tel: +1 (617) 542-5942@*
-51 Franklin Street, Fifth Floor @hfill Fax: +1 (617) 542-2652@*
-Boston, MA 02110-1301 USA
+31 Milk Street, # 960789        @hfill Fax: +1 (617) 542-2652@*
+Boston, MA 02196 USA
 @end iftex
 
 @ifnottex
@@ -136,8 +136,8 @@ Printed copies available from @uref{https://shop.fsf.org/}.  Published by:
 GNU Press,                        https://www.fsf.org/licensing/gnu-press/
 a division of the                 email: sales@@fsf.org
 Free Software Foundation, Inc.    Tel: +1 (617) 542-5942
-51 Franklin Street, Fifth Floor   Fax: +1 (617) 542-2652
-Boston, MA 02110-1301 USA
+31 Milk Street, # 960789          Fax: +1 (617) 542-2652
+Boston, MA 02196 USA
 @end example
 @end ifnottex
 
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index f464bcfe94f..1ce89c6431f 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -140,8 +140,8 @@ developing GNU and promoting software freedom.''
 
 @sp 2
 Published by the Free Software Foundation @*
-51 Franklin St, Fifth Floor @*
-Boston, MA 02110-1301 @*
+31 Milk Street, # 960789 @*
+Boston, MA 02196 @*
 USA @*
 ISBN 1-882114-74-4
 
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 73ff170401e..f0b7fef30c7 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -1910,8 +1910,8 @@ pairs.  The following properties are supported:
 @item :category
 The value should be a symbol describing what kind of text the
 completion function is trying to complete.  If the symbol matches one
-of the keys in @code{completion-category-overrides}, the usual
-completion behavior is overridden.  @xref{Completion Variables}.
+of the keys in @code{completion-category-overrides} described above,
+the usual completion behavior is overridden.
 
 @item :annotation-function
 The value should be a function to add annotations in the completions
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 27b74a9d233..ddb6c4bf2fb 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -2227,8 +2227,9 @@ construct.)
 @item (:eval @var{form})
 A list whose first element is the symbol @code{:eval} says to evaluate
 @var{form}, and use the result as a string to display.  Make sure this
-evaluation cannot load any files, as doing so could cause infinite
-recursion.
+evaluation neither loads any files nor calls functions like
+@code{posn-at-point} or @code{window-in-direction}, which themselves
+evaluate the mode line, as doing so could cause infinite recursion.
 
 @item (:propertize @var{elt} @var{props}@dots{})
 A list whose first element is the symbol @code{:propertize} says to
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 399a1d169c2..34ea7cf4996 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -2413,10 +2413,12 @@ the converse is not always true.
 @end group
 @end example
 
-The @code{equal} function recursively compares the contents of objects
-if they are integers, strings, markers, lists, cons cells, vectors,
-bool-vectors, byte-code function objects, char-tables, records, or font
-objects.
+The @code{equal} function compares strings and bool-vectors by value.
+Numbers are compared by type and numeric value, using @code{eql}.
+Lists, cons cells, vectors, records, markers, char-tables, font objects,
+and function objects (closures)@footnote{However, equality of distinct
+function objects cannot be guaranteed in general.} are compared
+recursively by using @code{equal} on their constituent parts.
 
 Comparison of strings is case-sensitive, but does not take account of
 text properties---it compares only the characters in the strings.
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 37cfe264157..d813fc6b20e 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -788,6 +788,14 @@ other kinds, such as words and string constants.
 ---------- Buffer: foo ----------
 @end group
 @end example
+
+@vindex forward-sexp-function
+@code{forward-sexp} calls the function that is the value of the variable
+@code{forward-sexp-function}, if that is non-@code{nil}, to do the
+actual work, passing it the same arguments as those with which the
+command was called.  Major modes can define their own functions for
+moving over balanced expressions as appropriate for the mode, and set
+this variable to that function.
 @end deffn
 
 @deffn Command backward-sexp &optional arg
@@ -898,7 +906,8 @@ If Emacs is compiled with tree-sitter, it can use the tree-sitter
 parser information to move across syntax constructs.  Since what
 exactly is considered a sexp varies between languages, a major mode
 should set @code{treesit-thing-settings} to determine that.  Then
-the mode can get navigation-by-sexp functionality for free, by using
+@code{forward-sexp-function} will be set to @code{treesit-forward-sexp},
+and the mode can get navigation-by-sexp functionality for free, by using
 @code{forward-sexp} and @code{backward-sexp}(@pxref{Expressions,
 ,, emacs, The extensible self-documenting text editor}).
 
diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 521361250b8..c0e78966d45 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -954,7 +954,7 @@ used.
 @item
 New major modes based on the
 @uref{https://tree-sitter.github.io/tree-sitter/, tree-sitter library}
-library for editing Elixir, HTML, Lua, HEEx, and PHP.
+library for editing Elixir, HEEx, HTML, Lua, and PHP.
 
 @item
 Support for the EditorConfig standard has been added, an editor-neutral
diff --git a/doc/misc/org.org b/doc/misc/org.org
index dcc1ddc7f44..e595d0be195 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -3788,8 +3788,8 @@ argument.
 
 With the above setting, you could link to a specific bug with
 =[[bugzilla:129]]=, search the web for =OrgMode= with =[[duckduckgo:OrgMode]]=,
-show the map location of the Free Software Foundation =[[gmap:51
-Franklin Street, Boston]]= or of Carsten office =[[omap:Science Park 904,
+show the map location of the Free Software Foundation =[[omap:31
+Milk Street, Boston]]= or of Carsten's office =[[omap:Science Park 904,
 Amsterdam, The Netherlands]]= and find out what the Org author is doing
 besides Emacs hacking with =[[ads:Dominik,C]]=.
 
diff --git a/doc/misc/vtable.texi b/doc/misc/vtable.texi
index 2e0adfb235a..795d7fad037 100644
--- a/doc/misc/vtable.texi
+++ b/doc/misc/vtable.texi
@@ -337,7 +337,9 @@ width (in pixels), and @var{table} is the table.
 @end defun
 
 @item align
-Should be either @code{right} or @code{left}.
+Should be either @code{right} or @code{left}.  If not specified,
+numerical values will be flushed to the right, and all other values will
+be flushed to the left.
 @end table
 
 @item :getter
@@ -426,14 +428,19 @@ current line, they can use the @code{vtable-current-object} function
 (@pxref{Interface Functions}) to determine what that object is.
 
 @item :separator-width
-The width of the blank space between columns.
+The width of the blank space between columns.  If not specified, it
+defaults to 1.
 
 @item :divider-width
 @itemx :divider
-You can have a divider inserted between the columns.  This can either
-be specified by using @code{:divider}, which should be a string to be
-displayed between the columns, or @code{:divider-width}, which
-specifies the width of the space to be used as the divider.
+You can have a divider inserted between the columns.  This can either be
+specified by using @code{:divider}, which should be a string to be
+displayed between the columns, or @code{:divider-width}, which specifies
+the width of the space to be used as the divider, in units of characters
+of the face used to display the table.  If not specified,
+@code{:divider} defaults to @code{nil}, but specifying
+@code{:divider-width} effectively sets the divider to a whitespace
+string of that width.
 
 @item :sort-by
 This should be a list of tuples, and specifies how the table is to be