[Emacs-diffs] emacs/src minibuf.c

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/24 19:13:30

Modified files:
        src            : minibuf.c 

Log message:
        (Fcompleting_read, Vminibuffer_completion_confirm): Document
        confirm-after-completion value for minibuffer-completion-confirm.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/minibuf.c?cvsroot=emacs&r1=1.357&r2=1.358

Patches:
Index: minibuf.c
===================================================================
RCS file: /sources/emacs/emacs/src/minibuf.c,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -b -r1.357 -r1.358
--- minibuf.c   2 Nov 2008 10:41:28 -0000       1.357
+++ minibuf.c   24 Nov 2008 19:13:29 -0000      1.358
@@ -1723,8 +1723,12 @@
 - t means that the user is not allowed to exit unless
   the input is (or completes to) an element of COLLECTION or is null.
 - nil means that the user can exit with any input.
-- `confirm-only' means that the user can exit with any input, but she will
-  need to confirm her choice if the input is not an element of COLLECTION.
+- `confirm' means that the user can exit with any input, but she needs
+  to confirm her choice if the input is not an element of COLLECTION.
+- `confirm-after-completion' means that the user can exit with any
+  input, but she needs to confirm her choice if she called
+  `minibuffer-complete' right before `minibuffer-complete-and-exit'
+  and the input is not an element of COLLECTION.
 - anything else behaves like t except that typing RET does not exit if it
   does non-null completion.
 
@@ -2187,7 +2191,14 @@
   Vminibuffer_completion_predicate = Qnil;
 
   DEFVAR_LISP ("minibuffer-completion-confirm", 
&Vminibuffer_completion_confirm,
-              doc: /* Non-nil means to demand confirmation of completion 
before exiting minibuffer.  */);
+              doc: /* Whether to demand confirmation of completion before 
exiting minibuffer.
+If nil, confirmation is not required.
+If the value is `confirm', the user may exit with an input that is not
+ a valid completion alternative, but Emacs asks for confirmation.
+If the value is `confirm-after-completion', the user may exit with an
+ input that is not a valid completion alternative, but Emacs asks for
+ confirmation if the user submitted the input right after
+ `minibuffer-complete'.  */);
   Vminibuffer_completion_confirm = Qnil;
 
   DEFVAR_LISP ("minibuffer-completing-file-name",