diff options
| author | Stefan Monnier | 2010-04-19 14:33:11 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-04-19 14:33:11 -0400 |
| commit | 56d365a93da3c6b439998c251e9f01c73791f4b2 (patch) | |
| tree | ca494121884bcdd2b900e609f05b179294acd119 | |
| parent | 87926e02dccd90bb8e01ccc648d69809d7811fe0 (diff) | |
| download | emacs-56d365a93da3c6b439998c251e9f01c73791f4b2.tar.gz emacs-56d365a93da3c6b439998c251e9f01c73791f4b2.zip | |
(completion-styles-alist): Fix up last merge and document `substring'.
| -rw-r--r-- | lisp/minibuffer.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index c7d0d1c3a0c..2730350c3df 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -402,14 +402,17 @@ pattern \"foo*bar*\".") | |||
| 402 | "Completion of multiple words, each one taken as a prefix. | 402 | "Completion of multiple words, each one taken as a prefix. |
| 403 | I.e. when completing \"l-co_h\" (where _ is the position of point), | 403 | I.e. when completing \"l-co_h\" (where _ is the position of point), |
| 404 | it will consider all completions candidates matching the glob | 404 | it will consider all completions candidates matching the glob |
| 405 | (substring | ||
| 406 | completion-substring-try-completion completion-substring-all-completions | ||
| 407 | "Completion of the string taken as a substring.") | ||
| 408 | pattern \"l*-co*h*\". | 405 | pattern \"l*-co*h*\". |
| 409 | Furthermore, for completions that are done step by step in subfields, | 406 | Furthermore, for completions that are done step by step in subfields, |
| 410 | the method is applied to all the preceding fields that do not yet match. | 407 | the method is applied to all the preceding fields that do not yet match. |
| 411 | E.g. C-x C-f /u/mo/s TAB could complete to /usr/monnier/src. | 408 | E.g. C-x C-f /u/mo/s TAB could complete to /usr/monnier/src. |
| 412 | Additionally the user can use the char \"*\" as a glob pattern.") | 409 | Additionally the user can use the char \"*\" as a glob pattern.") |
| 410 | (substring | ||
| 411 | completion-substring-try-completion completion-substring-all-completions | ||
| 412 | "Completion of the string taken as a substring. | ||
| 413 | I.e. when completing \"foo_bar\" (where _ is the position of point), | ||
| 414 | it will consider all completions candidates matching the glob | ||
| 415 | pattern \"*foo*bar*\".") | ||
| 413 | (initials | 416 | (initials |
| 414 | completion-initials-try-completion completion-initials-all-completions | 417 | completion-initials-try-completion completion-initials-all-completions |
| 415 | "Completion of acronyms and initialisms. | 418 | "Completion of acronyms and initialisms. |