diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2008-11-24 19:13:29 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2008-11-24 19:13:29 +0000 |
| commit | b47d0e56c46336135a61e64f8dbeccb11e1fc06d (patch) | |
| tree | 8775c5fd98b88ada2271327363a1c8c6a2908ef1 /src/minibuf.c | |
| parent | e7d5ecb378e26733c6b13cfb757c088e7d0e6c73 (diff) | |
| download | emacs-b47d0e56c46336135a61e64f8dbeccb11e1fc06d.tar.gz emacs-b47d0e56c46336135a61e64f8dbeccb11e1fc06d.tar.bz2 emacs-b47d0e56c46336135a61e64f8dbeccb11e1fc06d.zip | |
(Fcompleting_read, Vminibuffer_completion_confirm): Document
confirm-after-completion value for minibuffer-completion-confirm.
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index f10d602c32e..ed892e9dc92 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1723,8 +1723,12 @@ REQUIRE-MATCH can take the following values: - 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 @@ CODE can be nil, t or `lambda': 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", |