[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99841: * minibuf.c (Fall_completions): Add more checks.

[Andreas Schwab]

------------------------------------------------------------
revno: 99841
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Tue 2010-06-08 19:56:21 +0200
message:
  * minibuf.c (Fall_completions): Add more checks.
modified:
  src/ChangeLog
  src/minibuf.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-06-08 16:53:11 +0000
+++ b/src/ChangeLog     2010-06-08 17:56:21 +0000
@@ -1,3 +1,7 @@
+2010-06-08  Andreas Schwab  <address@hidden>
+
+       * minibuf.c (Fall_completions): Add more checks.
+
 2010-06-08  Juanma Barranquero  <address@hidden>
 
        * minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378).

=== modified file 'src/minibuf.c'
--- a/src/minibuf.c     2010-06-08 16:53:11 +0000
+++ b/src/minibuf.c     2010-06-08 17:56:21 +0000
@@ -1590,7 +1590,9 @@
   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 @@
        }
       else if (type == 2)
        {
-         if (!EQ (bucket, zero))
+         if (SYMBOLP (bucket))
            {
              elt = bucket;
              eltstring = elt;