* minibuf.c (Fall_completions): Add more checks.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5dc2c25a984bfc6b52f9a6bf96518e969260ef7c..9ba428053b9a189476eb8ab8a0552ae0d7fc623a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * minibuf.c (Fall_completions): Add more checks.
+
 2010-06-08  Juanma Barranquero  <lekktu@gmail.com>
 
        * minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).

diff --git a/src/minibuf.c b/src/minibuf.c
index 0a57d2a82eb0c7143a1630fb0a10f65d7b548536..54b0b1510cef8a90577870b14dff19871f326594 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1590,7 +1590,9 @@ with a space are ignored unless STRING itself starts with a space.  */)
   if (type == 2)
     {
       obsize = XVECTOR (collection)->size;
-      bucket = obsize ? XVECTOR (collection)->contents[index] : zero;
+      if (obsize == 0)
+       return Qnil;
+      bucket = XVECTOR (collection)->contents[index];
     }
 
   while (1)
@@ -1610,7 +1612,7 @@ with a space are ignored unless STRING itself starts with a space.  */)
        }
       else if (type == 2)
        {
-         if (!EQ (bucket, zero))
+         if (SYMBOLP (bucket))
            {
              elt = bucket;
              eltstring = elt;