master 77d90ce79a 2/2: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit 77d90ce79a1793bf2c398ee9ff2bf7da1f6a877d
Merge: 8cf986702d d5e1424174
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    d5e1424174 Expand docstrings related to auto-saving
---
 lisp/files.el  |  7 ++++++-
 lisp/simple.el | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/lisp/files.el b/lisp/files.el
index 185aae164d..8812175014 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -446,6 +446,9 @@ idle for `auto-save-visited-interval' seconds."
 (define-minor-mode auto-save-visited-mode
   "Toggle automatic saving to file-visiting buffers on or off.
 
+When this mode is enabled, visited files are saved automatically.
+The user option `auto-save-visited-interval' controls how often.
+
 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.
@@ -454,7 +457,9 @@ You can also set the buffer-local value of the variable
 `auto-save-visited-mode' to nil.  A buffer where the buffer-local
 value of this variable is nil is ignored for the purpose of
 `auto-save-visited-mode', even if `auto-save-visited-mode' is
-enabled."
+enabled.
+
+For more details, see Info node `(emacs) Auto Save Files'."
   :group 'auto-save
   :global t
   (when auto-save--timer (cancel-timer auto-save--timer))
diff --git a/lisp/simple.el b/lisp/simple.el
index d02a32b944..042384bbe7 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -8937,7 +8937,19 @@ presented."
   :global t :group 'mode-line)
 
 (define-minor-mode auto-save-mode
-  "Toggle auto-saving in the current buffer (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]).
+
+For more details, see Info node `(emacs) Auto Save'."
   :variable ((and buffer-auto-save-file-name
                   ;; If auto-save is off because buffer has shrunk,
                   ;; then toggling should turn it on.