diff options
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index 31c0fd1768e..7b276a2e925 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1293,6 +1293,7 @@ is used to further constrain the set of candidates. */) tail = alist; if (type == 2) { + alist = check_obarray (alist); obsize = XVECTOR (alist)->size; bucket = XVECTOR (alist)->contents[index]; } @@ -1316,6 +1317,8 @@ is used to further constrain the set of candidates. */) { if (!EQ (bucket, zero)) { + if (!SYMBOLP (bucket)) + error ("Bad data in guts of obarray"); elt = bucket; eltstring = elt; if (XSYMBOL (bucket)->next) @@ -2883,10 +2886,10 @@ The value may alternatively be a function, which is given three arguments: STRING, the current buffer contents; PREDICATE, the predicate for filtering possible matches; CODE, which says what kind of things to do. -CODE can be nil, t or `lambda'. -nil means to return the best completion of STRING, or nil if there is none. -t means to return a list of all possible completions of STRING. -`lambda' means to return t if STRING is a valid completion as it stands. */); +CODE can be nil, t or `lambda': + nil -- return the best completion of STRING, or nil if there is none. + t -- return a list of all possible completions of STRING. + lambda -- return t if STRING is a valid completion as it stands. */); Vminibuffer_completion_table = Qnil; DEFVAR_LISP ("minibuffer-completion-predicate", &Vminibuffer_completion_predicate, |