Mercurial > hg > xemacs-beta

diff src/minibuf.c @ 5118:e0db3c197671 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 44c9d1005ce2
children 6ef8256a020a 19a72041c5ed
line wrap: on
line diff
--- a/src/minibuf.c	Sat Dec 26 00:20:27 2009 -0600
+++ b/src/minibuf.c	Sat Dec 26 21:18:49 2009 -0600
@@ -310,8 +310,9 @@
 common to all matches is returned as a string.  If there is no match
 at all, nil is returned.  For an exact match, t is returned.
 
-If COLLECTION is an alist, the cars of the elements of the alist
-\(which must be strings) form the set of possible completions.
+If COLLECTION is list, the elements of the list that are not cons
+cells and the cars of the elements of the list that are cons cells
+(which must be strings) form the set of possible completions.
 
 If COLLECTION is an obarray, the names of all symbols in the obarray
 are the possible completions.
@@ -385,7 +386,10 @@
 	  if (NILP (tail))
 	    break;
 	  elt = Fcar (tail);
-	  eltstring = Fcar (elt);
+	  if (CONSP (elt))
+	    eltstring = Fcar (elt);
+	  else
+	    eltstring = elt;
 	  tail = Fcdr (tail);
 	}
       else