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

3 files changed, 16 insertions, 9 deletions

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