From 657d4c0be3b677dda02f7d7e895ddb259b5de82b Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 8 Jun 2010 19:56:21 +0200 Subject: [PATCH] * minibuf.c (Fall_completions): Add more checks. --- src/ChangeLog | 4 ++++ src/minibuf.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 5dc2c25a98..9ba428053b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2010-06-08 Andreas Schwab + + * minibuf.c (Fall_completions): Add more checks. + 2010-06-08 Juanma Barranquero * minibuf.c (Fall_completions): Check COLLECTION's size (bug#6378). diff --git a/src/minibuf.c b/src/minibuf.c index 0a57d2a82e..54b0b1510c 100644 --- 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; -- 2.39.2