Mercurial > emacs

changeset 108942:b11cb747f0d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* minibuf.c (Fall_completions): Add more checks.
author Andreas Schwab <schwab@linux-m68k.org>
date Tue, 08 Jun 2010 21:42:10 +0200
parents ef11028b9610
children 04a1a4b18129
files src/minibuf.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/minibuf.c	Tue Jun 08 19:56:21 2010 +0200
+++ b/src/minibuf.c	Tue Jun 08 21:42:10 2010 +0200
@@ -1589,9 +1589,8 @@
   tail = collection;
   if (type == 2)
     {
+      collection = check_obarray (collection);
       obsize = XVECTOR (collection)->size;
-      if (obsize == 0)
-	return Qnil;
       bucket = XVECTOR (collection)->contents[index];
     }
 
@@ -1612,8 +1611,10 @@
 	}
       else if (type == 2)
 	{
-	  if (SYMBOLP (bucket))
+	  if (!EQ (bucket, zero))
 	    {
+	      if (!SYMBOLP (bucket))
+		error ("Bad data in guts of obarray");
 	      elt = bucket;
 	      eltstring = elt;
 	      if (XSYMBOL (bucket)->next)