[Emacs-diffs] /srv/bzr/emacs/trunk r99946: (completion-styles-alist): Fix up last merge and document `substring'.

[Stefan Monnier]

------------------------------------------------------------
revno: 99946
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2010-04-19 14:33:11 -0400
message:
  (completion-styles-alist): Fix up last merge and document `substring'.
modified:
  lisp/minibuffer.el

=== modified file 'lisp/minibuffer.el'
--- a/lisp/minibuffer.el        2010-04-19 15:07:52 +0000
+++ b/lisp/minibuffer.el        2010-04-19 18:33:11 +0000
@@ -402,14 +402,17 @@
      "Completion of multiple words, each one taken as a prefix.
 I.e. when completing \"l-co_h\" (where _ is the position of point),
 it will consider all completions candidates matching the glob
-    (substring
-     completion-substring-try-completion completion-substring-all-completions
-     "Completion of the string taken as a substring.")
 pattern \"l*-co*h*\".
 Furthermore, for completions that are done step by step in subfields,
 the method is applied to all the preceding fields that do not yet match.
 E.g. C-x C-f /u/mo/s TAB could complete to /usr/monnier/src.
 Additionally the user can use the char \"*\" as a glob pattern.")
+    (substring
+     completion-substring-try-completion completion-substring-all-completions
+     "Completion of the string taken as a substring.
+I.e. when completing \"foo_bar\" (where _ is the position of point),
+it will consider all completions candidates matching the glob
+pattern \"*foo*bar*\".")
     (initials
      completion-initials-try-completion completion-initials-all-completions
      "Completion of acronyms and initialisms.