master c8c8bbd855: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit c8c8bbd8551e1c19e9b76fe1e1f36e52e55ed040
Merge: 932cf200bb 115261b323
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    115261b323 ; Improve wording of recently-changed doc strings.
---
 lisp/files.el  | 13 +++++++------
 lisp/simple.el | 18 +++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index 2ea9d1e467..b99ccf66d8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -475,14 +475,15 @@ Any other value means that it will not."
   :version "29.1")
 
 (define-minor-mode auto-save-visited-mode
-  "Toggle automatic saving to file-visiting buffers on or off.
+  "Toggle automatic saving of file-visiting buffers to their files.
 
-When this mode is enabled, visited files are saved automatically.
-The user option `auto-save-visited-interval' controls how often.
+When this mode is enabled, file-visiting buffers are automatically
+saved to their files.  This is in contrast to `auto-save-mode', which
+auto-saves those buffers to a separate file, leaving the original
+file intact.  See Info node `Saving' for details of the save process.
 
-Unlike `auto-save-mode', this mode will auto-save buffer contents
-to the visited files directly and will also run all save-related
-hooks.  See Info node `Saving' for details of the save process.
+The user option `auto-save-visited-interval' controls how often to
+auto-save a buffer into its visited file.
 
 You can use `auto-save-visited-predicate' to control which
 buffers are saved.
diff --git a/lisp/simple.el b/lisp/simple.el
index caba924f6a..e048df3695 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -8926,15 +8926,15 @@ presented."
 (define-minor-mode auto-save-mode
   "Toggle auto-saving in the current buffer (Auto Save mode).
 
-When this mode is enabled, Emacs periodically saves each visited
-file in a separate file called the \"auto-save file\".  This is a
-safety measure to prevent you from losing more than a limited
-amount of work if the system crashes.
-
-Auto-saving does not alter the file you actually use: the visited
-file is changed only when you request saving it explicitly (such
-as with \\[save-buffer]).  If you want to save visited files
-automatically, use \\[auto-save-visited-mode]).
+When this mode is enabled, Emacs periodically saves each file-visiting
+buffer in a separate \"auto-save file\".  This is a safety measure to
+prevent you from losing more than a limited amount of work if the
+system crashes.
+
+Auto-saving does not alter the file visited by the buffer: the visited
+file is changed only when you request saving it explicitly (such as
+with \\[save-buffer]).  If you want to save the buffer into its
+visited files automatically, use \\[auto-save-visited-mode]).
 
 For more details, see Info node `(emacs) Auto Save'."
   :variable ((and buffer-auto-save-file-name