Mercurial > emacs
changeset 108941:ef11028b9610
* minibuf.c (Fall_completions): Add more checks.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Tue, 08 Jun 2010 19:56:21 +0200 |
| parents | 1a7733e684f6 |
| children | b11cb747f0d1 |
| files | src/ChangeLog src/minibuf.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Jun 08 18:53:11 2010 +0200 +++ b/src/ChangeLog Tue Jun 08 19:56:21 2010 +0200 @@ -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).
--- a/src/minibuf.c Tue Jun 08 18:53:11 2010 +0200 +++ b/src/minibuf.c Tue Jun 08 19:56:21 2010 +0200 @@ -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;