master acf4089 3/3: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit acf408934d771fe652fbd5a73e96cc12d93362c0
Merge: d7e7f92 8d81ab3
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    8d81ab374d time-stamp: %F is "file name" not "pathname" + other doc
    beaa7e14f3 ; Fix typos in CONTRIBUTE, ELisp manual, ediff
    747a1ae4ac * doc/misc/eww.texi (Advanced): Fix missed variable name e...
    52fe2340b8 * doc/emacs/windows.texi (Window Convenience): Use @code f...
    7d3a654e2a * doc/emacs/maintaining.texi (Basic VC Editing): Mention D...
    aeb19af4b5 ; * doc/emacs/building.texi (Lisp Libraries): Fix a typo. ...
    
    # Conflicts:
    #   etc/NEWS
---
 CONTRIBUTE                    |  2 +-
 doc/emacs/building.texi       |  2 +-
 doc/emacs/maintaining.texi    |  2 +-
 doc/emacs/text.texi           |  4 ++--
 doc/emacs/windows.texi        | 14 +++++++-------
 doc/lispref/functions.texi    |  2 +-
 doc/misc/eww.texi             | 10 +++++-----
 etc/NEWS.28                   | 32 ++++++++++++++++++++++----------
 lisp/time-stamp.el            |  4 ++--
 lisp/vc/ediff.el              |  4 ++--
 test/lisp/time-stamp-tests.el | 11 ++++++-----
 11 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/CONTRIBUTE b/CONTRIBUTE
index 023d026..8295a8e 100644
--- a/CONTRIBUTE
+++ b/CONTRIBUTE
@@ -58,7 +58,7 @@ format and whitespace are not munged in transit by the 
various mail
 agents.  To send just one such patch without additional remarks, it is
 also possible to use a command like
 
-  git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch'.
+  git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch
 
 However, we prefer the 'git format-patch' method with attachment, as
 doing so delivers patches in the correct and easily-recognizable format
diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi
index 2c694a5..f9ea1b3 100644
--- a/doc/emacs/building.texi
+++ b/doc/emacs/building.texi
@@ -1492,7 +1492,7 @@ Emacs Lisp Reference Manual}.
 code not unlike the one produced by a C or Fortran compiler.  Native
 code runs even faster than byte-code.  Natively-compiled Emacs Lisp
 code is stored in files whose names end in @samp{.eln}.  @xref{Native
-Compilation,, Byte Compilation, elisp, the Emacs Lisp Reference Manual}.
+Compilation,, Native Compilation, elisp, the Emacs Lisp Reference Manual}.
 
 @findex load-file
   To @dfn{load} an Emacs Lisp file, type @kbd{M-x load-file}.  This
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 9a90a00..ebd72fa 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -493,7 +493,7 @@ action on the current VC fileset: either registering it 
with a version
 control system, or committing it, or unlocking it, or merging changes
 into it.  The precise actions are described in detail in the following
 subsections.  You can use @kbd{C-x v v} either in a file-visiting
-buffer or in a VC Directory buffer.
+buffer, in a Dired buffer, or in a VC Directory buffer.
 
   Note that VC filesets are distinct from the named filesets used
 for viewing and visiting files in functional groups
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 5329133..ead0f69 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -1005,9 +1005,9 @@ displaying the section.
 
 @vindex outline-minor-mode-cycle
   If the @code{outline-minor-mode-cycle} user option is
-non-@code{nil}, the @kbd{TAB} and @kbd{S-TAB} keys are enabled on the
+non-@code{nil}, the @kbd{TAB} and @kbd{S-@key{TAB}} keys are enabled on the
 outline heading lines.  @kbd{TAB} cycles hiding, showing the
-sub-heading, and showing all for the current section.  @kbd{S-TAB}
+sub-heading, and showing all for the current section.  @kbd{S-@key{TAB}}
 does the same for the entire buffer.
 
 @menu
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 8cb88a2..27c7541 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -603,16 +603,16 @@ buffer.  @xref{Follow Mode}.
 between neighboring windows in a frame.  @kbd{M-x windmove-right}
 selects the window immediately to the right of the currently selected
 one, and similarly for the left, up, and down counterparts.
-@w{@kbd{M-x windmove-default-keybindings}} binds these commands to
+@code{windmove-default-keybindings} binds these commands to
 @kbd{S-right} etc.; doing so disables shift selection for those keys
 (@pxref{Shift Selection}).  In the same way as keybindings can be
 defined for commands that select windows directionally, you can use
-@w{@kbd{M-x windmove-display-default-keybindings}} to define
-keybindings for commands that specify in what direction to display the
-window for the buffer that the next command is going to display.
-Also there is @w{@kbd{M-x windmove-delete-default-keybindings}} to
-define keybindings for commands that delete windows directionally, and
-@w{@kbd{M-x windmove-swap-states-default-keybindings}} that defines
+@code{windmove-display-default-keybindings} to define keybindings for
+commands that specify in what direction to display the window for the
+buffer that the next command is going to display.  Also there is
+@code{windmove-delete-default-keybindings} to define keybindings for
+commands that delete windows directionally, and
+@code{windmove-swap-states-default-keybindings} that defines
 keybindings for commands that swap the window contents of the selected
 window with the window in the specified direction.
 
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 8f98ac9..9c1fde0 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -1450,7 +1450,7 @@ is not a function, e.g., a keyboard macro 
(@pxref{Keyboard Macros}):
      @result{} "\^u2\^k"
 @end example
 
-It you wish to use @code{fset} to make an alternate name for a
+If you wish to use @code{fset} to make an alternate name for a
 function, consider using @code{defalias} instead.  @xref{Definition of
 defalias}.
 @end defun
diff --git a/doc/misc/eww.texi b/doc/misc/eww.texi
index 95e59d9..ebfdaf5 100644
--- a/doc/misc/eww.texi
+++ b/doc/misc/eww.texi
@@ -229,11 +229,11 @@ in an external browser by customizing
 @findex eww-retrieve-command
   EWW normally uses @code{url-retrieve} to fetch the @acronym{HTML}
 before rendering it, and @code{url-retrieve-synchronously} when
-the value is @code{sync}.  It can sometimes be convenient to use an
-external program to do this, and @code{eww-retrieve-command} should
-then be a list that specifies a command and the parameters.  For
-instance, to use the Chromium browser, you could say something like
-this:
+the value of @code{eww-retrieve-command} is @code{sync}.  It can
+sometimes be convenient to use an external program to do this, and
+@code{eww-retrieve-command} should then be a list that specifies
+a command and the parameters.  For instance, to use the Chromium
+browser, you could say something like this:
 
 @lisp
 (setq eww-retrieve-command
diff --git a/etc/NEWS.28 b/etc/NEWS.28
index 1d1b37a..a7b4dc6 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -1367,6 +1367,7 @@ Non-nil reverts the destination Dired buffer after 
performing one
 of these operations: 'dired-do-copy', 'dired-do-rename',
 'dired-do-symlink', 'dired-do-hardlink'.
 
+---
 *** New user option 'dired-mark-region'.
 This option affects all Dired commands that mark files.  When non-nil
 and the region is active in Transient Mark mode, then Dired commands
@@ -1374,6 +1375,7 @@ operate only on files in the active region.  The values 
'file' and
 'line' of this user option define the details of marking the file at
 the end of the region.
 
++++
 *** State changing VC operations are supported in Dired.
 These operations are supported on files and directories via the new
 command 'dired-vc-next-action'.
@@ -1524,6 +1526,7 @@ used instead.
 
 ** Bookmarks
 
+---
 *** Bookmarks can now be targets for new tabs.
 When the bookmark.el library is loaded, a customize choice is added
 to 'tab-bar-new-tab-choice' for new tabs to show the bookmark list.
@@ -1841,17 +1844,21 @@ These options include 'windmove-default-keybindings',
 'windmove-display-default-keybindings',
 'windmove-delete-default-keybindings',
 'windmove-swap-states-default-keybindings'.
+Also new mode 'windmove-mode' enables the customized keybindings.
 
 ** Occur mode
 
+---
 *** New bindings in occur-mode.
 The command 'next-error-no-select' is now bound to 'n' and
 'previous-error-no-select' is bound to 'p'.
 
+---
 *** The new command 'recenter-current-error'.
 It is bound to 'l' in Occur or compilation buffers, and recenters the
 current displayed occurrence/error.
 
+---
 *** Matches in target buffers are now highlighted as in 'compilation-mode'.
 The method of highlighting is specified by the user options
 'next-error-highlight' and 'next-error-highlight-no-select'.
@@ -1897,13 +1904,12 @@ To revert to the previous behavior,
 If this user option is 'kill', then the diff buffer will be killed
 after the 'vc-revert' action instead of buried.
 
+---
 *** More VC commands can be used from non-file buffers.
 The relevant commands are those that don't change the VC state.
 The non-file buffers which can use VC commands are those that have
 their 'default-directory' under VC.
 
-*** New command 'vc-dir-root' uses the root directory without asking.
-
 ---
 *** New face 'log-view-commit-body'.
 This is used when expanding commit messages from 'vc-print-root-log'
@@ -1924,9 +1930,14 @@ specific (unregistered) file.  Previously, the first 
matching backend
 was chosen, but now the one with the most specific path is chosen (in
 case there's a directory handled by one backend inside another).
 
+---
+*** New command 'vc-dir-root' uses the root directory without asking.
+
+---
 *** New commands 'vc-dir-mark-registered-files' (bound to '* r') and
 'vc-dir-mark-unregistered-files'.
 
+---
 *** Support for bookmark.el.
 Bookmark locations can refer to VC directory buffers.
 
@@ -1948,6 +1959,7 @@ tags to be considered as well.
 *** New user option 'vc-git-log-switches'.
 String or list of strings specifying switches for Git log under VC.
 
+---
 *** Command 'vc-switch-backend' is now obsolete.
 If you are still using it with any regularity, please file a bug
 report with some details.
@@ -1976,7 +1988,6 @@ instead of sets, the process mark.
 If non-nil (the default), the '#' command in the Group and Summary
 buffers will toggle, instead of set, the process mark.
 
-
 +++
 *** New user option 'gnus-registry-register-all'.
 If non-nil (the default), create registry entries for all messages.
@@ -2421,7 +2432,7 @@ and data svg images.
 *** 'svg-embed-base-uri-image' added to embed images.
 'svg-embed-base-uri-image' can be used to embed images located
 relatively to 'file-name-directory' of the ':base-uri' svg image property.
-This works much faster then 'svg-embed'.
+This works much faster than 'svg-embed'.
 
 +++
 *** New function 'image-cache-size'.
@@ -2509,7 +2520,8 @@ This is a regexp that can be set to alter how links are 
followed in eww.
 *** New user option 'eww-retrieve-command'.
 This can be used to download data via an external command.  If nil
 (the default), then 'url-retrieve' is used.  When 'sync', then
-'url-retrieve-synchronously' is used.
+'url-retrieve-synchronously' is used.  A list of strings specifies
+an external program with parameters.
 
 +++
 *** New Emacs command line convenience command.
@@ -2634,11 +2646,6 @@ via 'M-n'.
 
 ** Xref
 
----
-*** Prefix arg of 'xref-goto-xref' quits the "*xref*" buffer.
-So typing 'C-u RET' in the "*xref*" buffer quits its window
-before navigating to the selected location.
-
 +++
 *** New user options to automatically show the first Xref match.
 The new user option 'xref-auto-jump-to-first-definition' controls the
@@ -2688,6 +2695,11 @@ TRT.
 If chosen, file names in "*xref*" buffers will be displayed relative
 to the 'project-root' of the current project, when available.
 
+---
+*** Prefix arg of 'xref-goto-xref' quits the "*xref*" buffer.
+So typing 'C-u RET' in the "*xref*" buffer quits its window
+before navigating to the selected location.
+
 +++
 *** The 'TAB' key binding in "*xref*" buffers is obsolete.
 Use 'C-u RET' instead.  The 'TAB' binding in "*xref*" buffers is still
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index 178e490..04e736d 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -65,7 +65,7 @@ with %, as follows.
 
 Non-date items:
 %%   a literal percent character: `%'
-%f   file name without directory        %F  gives absolute pathname
+%f   file name without directory        %F  absolute file name
 %l   login name                         %L  full name of logged-in user
 %q   unqualified host name              %Q  fully-qualified host name
 %h   mail host name
@@ -661,7 +661,7 @@ and all `time-stamp-format' compatibility."
                    (if buffer-file-name
                        (file-name-nondirectory buffer-file-name)
                      time-stamp-no-file))
-                  ((eq cur-char ?F)    ;buffer-file-name, full path
+                  ((eq cur-char ?F)    ;buffer-file-name, absolute name
                    (or buffer-file-name
                        time-stamp-no-file))
                   ((eq cur-char ?s)    ;system name, legacy
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 49fc604..97c84ae 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -983,9 +983,9 @@ STARTUP-HOOKS is a list of functions that Emacs calls 
without
 arguments after setting up the Ediff buffers."
   (interactive
    (let (bf)
-     (list (setq bf (read-buffer "Region's A buffer: "
+     (list (setq bf (read-buffer "Region A's buffer: "
                                 (ediff-other-buffer "") t))
-          (read-buffer "Region's B buffer: "
+          (read-buffer "Region B's buffer: "
                        (progn
                          ;; realign buffers so that two visible bufs will be
                          ;; at the top
diff --git a/test/lisp/time-stamp-tests.el b/test/lisp/time-stamp-tests.el
index fa9edcb..cb446eb 100644
--- a/test/lisp/time-stamp-tests.el
+++ b/test/lisp/time-stamp-tests.el
@@ -704,9 +704,10 @@
 ;;;; Setup for tests of time offset formatting with %z
 
 (defun formatz (format zone)
-  "Uses time FORMAT string to format the offset of ZONE, returning the result.
-FORMAT is \"%z\" or a variation.
-ZONE is as the ZONE argument of the `format-time-string' function."
+  "Uses FORMAT to format the offset of ZONE, returning the result.
+FORMAT must be time format \"%z\" or some variation thereof.
+ZONE is as the ZONE argument of the `format-time-string' function.
+This function is called by 99% of the `time-stamp' \"%z\" unit tests."
   (with-time-stamp-test-env
    (let ((time-stamp-time-zone zone))
      ;; Call your favorite time formatter here.
@@ -718,9 +719,9 @@ ZONE is as the ZONE argument of the `format-time-string' 
function."
 
 (defun format-time-offset (format offset-secs)
   "Uses FORMAT to format the time zone represented by OFFSET-SECS.
-FORMAT must be \"%z\", possibly with a flag and padding.
+FORMAT must be time format \"%z\" or some variation thereof.
 This function is a wrapper around `time-stamp-formatz-from-parsed-options'
-and is used for testing."
+and is called by some low-level `time-stamp' \"%z\" unit tests."
   ;; This wrapper adds a simple regexp-based parser that handles only
   ;; %z and variants.  In normal use, time-stamp-formatz-from-parsed-options
   ;; is called from a parser that handles all time string formats.