master 94fc8d53376 2/4: Merge from origin/emacs-29

[Eli Zaretskii]

branch: master
commit 94fc8d533769d68795cdbc560b182c54020e0db5
Merge: a7ad6c503a3 5ce02c91bc1
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-29
    
    5ce02c91bc1 Improve `desktop-save-mode` docstring
    2f98b13ed05 ; Fix doc strings of splash-screen data structures
    77f5d4d523a Fix completing-read functional REQUIRE-MATCH behavior
---
 lisp/desktop.el    | 17 +++++++++++++----
 lisp/minibuffer.el | 11 +++++++----
 lisp/startup.el    |  4 ++--
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/lisp/desktop.el b/lisp/desktop.el
index e3994ceb83c..3fa09ce6a41 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -163,10 +163,19 @@ Used at desktop read to provide backward compatibility.")
 (define-minor-mode desktop-save-mode
   "Toggle desktop saving (Desktop Save mode).
 
-When Desktop Save mode is enabled, the state of Emacs is saved from
-one session to another.  In particular, Emacs will save the desktop when
-it exits (this may prompt you; see the option `desktop-save').  The next
-time Emacs starts, if this mode is active it will restore the desktop.
+When Desktop Save mode is enabled, the state of Emacs is saved from one
+session to another.  The saved Emacs \"desktop configuration\" includes the
+buffers, their file names, major modes, buffer positions, window and frame
+configuration, and some important global variables.
+
+To enable this feature for future sessions, customize `desktop-save-mode'
+to t, or add this line in your init file:
+
+    (desktop-save-mode 1)
+
+When this mode is enabled, Emacs will save the desktop when it exits
+(this may prompt you, see the option `desktop-save').  The next time
+Emacs starts, if this mode is active it will restore the desktop.
 
 To manually save the desktop at any time, use the command \\[desktop-save].
 To load it, use \\[desktop-read].
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 642ffad171a..0bfc5c06313 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1970,10 +1970,13 @@ appear to be a match."
    ;; Allow user to specify null string
    ((= beg end) (funcall exit-function))
    ;; The CONFIRM argument is a predicate.
-   ((and (functionp minibuffer-completion-confirm)
-         (funcall minibuffer-completion-confirm
-                  (buffer-substring beg end)))
-    (funcall exit-function))
+   ((functionp minibuffer-completion-confirm)
+    (if (funcall minibuffer-completion-confirm
+                 (buffer-substring beg end))
+        (funcall exit-function)
+      (unless completion-fail-discreetly
+       (ding)
+       (completion--message "No match"))))
    ;; See if we have a completion from the table.
    ((test-completion (buffer-substring beg end)
                      minibuffer-completion-table
diff --git a/lisp/startup.el b/lisp/startup.el
index 23937055f30..773765a4b97 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1758,7 +1758,7 @@ If this is nil, no message will be displayed."
      "\n"))
   "A list of texts to show in the middle part of splash screens.
 Each element in the list should be a list of strings or pairs
-`:face FACE', like `fancy-splash-insert' accepts them.")
+`:KEYWORD VALUE', like what `fancy-splash-insert' accepts.")
 
 (defconst fancy-about-text
   `((:face (variable-pitch font-lock-comment-face)
@@ -1851,7 +1851,7 @@ Each element in the list should be a list of strings or 
pairs
      "\tDisplay the Emacs manual in Info mode"))
   "A list of texts to show in the middle part of the About screen.
 Each element in the list should be a list of strings or pairs
-`:face FACE', like `fancy-splash-insert' accepts them.")
+`:KEYWORD VALUE', like what `fancy-splash-insert' accepts.")
 
 
 (defgroup fancy-splash-screen ()