diff options
| author | Chong Yidong | 2008-11-24 19:13:29 +0000 |
|---|---|---|
| committer | Chong Yidong | 2008-11-24 19:13:29 +0000 |
| commit | b47d0e56c46336135a61e64f8dbeccb11e1fc06d (patch) | |
| tree | 8775c5fd98b88ada2271327363a1c8c6a2908ef1 | |
| parent | e7d5ecb378e26733c6b13cfb757c088e7d0e6c73 (diff) | |
| download | emacs-b47d0e56c46336135a61e64f8dbeccb11e1fc06d.tar.gz emacs-b47d0e56c46336135a61e64f8dbeccb11e1fc06d.zip | |
(Fcompleting_read, Vminibuffer_completion_confirm): Document
confirm-after-completion value for minibuffer-completion-confirm.
| -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: | |||
| 1723 | - t means that the user is not allowed to exit unless | 1723 | - t means that the user is not allowed to exit unless |
| 1724 | the input is (or completes to) an element of COLLECTION or is null. | 1724 | the input is (or completes to) an element of COLLECTION or is null. |
| 1725 | - nil means that the user can exit with any input. | 1725 | - nil means that the user can exit with any input. |
| 1726 | - `confirm-only' means that the user can exit with any input, but she will | 1726 | - `confirm' means that the user can exit with any input, but she needs |
| 1727 | need to confirm her choice if the input is not an element of COLLECTION. | 1727 | to confirm her choice if the input is not an element of COLLECTION. |
| 1728 | - `confirm-after-completion' means that the user can exit with any | ||
| 1729 | input, but she needs to confirm her choice if she called | ||
| 1730 | `minibuffer-complete' right before `minibuffer-complete-and-exit' | ||
| 1731 | and the input is not an element of COLLECTION. | ||
| 1728 | - anything else behaves like t except that typing RET does not exit if it | 1732 | - anything else behaves like t except that typing RET does not exit if it |
| 1729 | does non-null completion. | 1733 | does non-null completion. |
| 1730 | 1734 | ||
| @@ -2187,7 +2191,14 @@ CODE can be nil, t or `lambda': | |||
| 2187 | Vminibuffer_completion_predicate = Qnil; | 2191 | Vminibuffer_completion_predicate = Qnil; |
| 2188 | 2192 | ||
| 2189 | DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm, | 2193 | DEFVAR_LISP ("minibuffer-completion-confirm", &Vminibuffer_completion_confirm, |
| 2190 | doc: /* Non-nil means to demand confirmation of completion before exiting minibuffer. */); | 2194 | doc: /* Whether to demand confirmation of completion before exiting minibuffer. |
| 2195 | If nil, confirmation is not required. | ||
| 2196 | If the value is `confirm', the user may exit with an input that is not | ||
| 2197 | a valid completion alternative, but Emacs asks for confirmation. | ||
| 2198 | If the value is `confirm-after-completion', the user may exit with an | ||
| 2199 | input that is not a valid completion alternative, but Emacs asks for | ||
| 2200 | confirmation if the user submitted the input right after | ||
| 2201 | `minibuffer-complete'. */); | ||
| 2191 | Vminibuffer_completion_confirm = Qnil; | 2202 | Vminibuffer_completion_confirm = Qnil; |
| 2192 | 2203 | ||
| 2193 | DEFVAR_LISP ("minibuffer-completing-file-name", | 2204 | DEFVAR_LISP ("minibuffer-completing-file-name", |