[Emacs-diffs] /srv/bzr/emacs/trunk r110368: * minibuf.texi (Basic Completion): Clarify list form of completion table.

[Chong Yidong]

------------------------------------------------------------
revno: 110368
fixes bug: http://debbugs.gnu.org/12564
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-05 15:48:25 +0800
message:
  * minibuf.texi (Basic Completion): Clarify list form of completion table.
modified:
  doc/lispref/ChangeLog
  doc/lispref/minibuf.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-10-05 07:38:05 +0000
+++ b/doc/lispref/ChangeLog     2012-10-05 07:48:25 +0000
@@ -1,3 +1,8 @@
+2012-10-05  Chong Yidong  <address@hidden>
+
+       * minibuf.texi (Basic Completion): Clarify list form of completion
+       table (Bug#12564).
+
 2012-10-05  Bruno Félix Rezende Ribeiro  <address@hidden>  (tiny change)
 
        * functions.texi (Function Safety): Copyedit.  (Bug#12562)

=== modified file 'doc/lispref/minibuf.texi'
--- a/doc/lispref/minibuf.texi  2012-09-09 07:09:03 +0000
+++ b/doc/lispref/minibuf.texi  2012-10-05 07:48:25 +0000
@@ -664,25 +664,22 @@
 completions of @var{string} in @var{collection}.
 
 @cindex completion table
-The @var{collection} argument is called the @dfn{completion table}.
-Its value must be a list of strings, an alist whose keys are strings
-or symbols, an obarray, a hash table, or a completion function.
address@hidden is called the @dfn{completion table}.  Its value must
+be a list of strings or cons cells, an obarray, a hash table, or a
+completion function.
 
-Completion compares @var{string} against each of the permissible
-completions specified by @var{collection}.  If no permissible
-completions match, @code{try-completion} returns @code{nil}.  If there
-is just one matching completion, and the match is exact, it returns
address@hidden compares @var{string} against each of the
+permissible completions specified by the completion table.  If no
+permissible completions match, it returns @code{nil}.  If there is
+just one matching completion, and the match is exact, it returns
 @code{t}.  Otherwise, it returns the longest initial sequence common
 to all possible matching completions.
 
-If @var{collection} is an alist (@pxref{Association Lists}), the
-permissible completions are the elements of the alist that are either
-strings, or conses whose @sc{car} is a string or symbol.
-Symbols are converted to strings using @code{symbol-name}.  Other
-elements of the alist are ignored.  (Remember that in Emacs Lisp, the
-elements of alists do not @emph{have} to be conses.)  In particular, a
-list of strings is allowed, even though we usually do not
-think of such lists as alists.
+If @var{collection} is an list, the permissible completions are
+specified by the elements of the list, each of which should be either
+a string, or a cons cell whose @sc{car} is either a string or a symbol
+(a symbol is converted to a string using @code{symbol-name}).  If the
+list contains elements of any other type, those are ignored.
 
 @cindex obarray in completion
 If @var{collection} is an obarray (@pxref{Creating Symbols}), the names