mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-02 10:01:11 +02:00
Code Releases Activity

27415: Src/Zle/computil.c: comparguments "*::..." descriptions could step

Browse source 
on sequentially earlier descriptions when completing for a word other than
the last word on the command line.
This commit is contained in:
Bart Schaefer 2009-11-21 06:51:14 +00:00
parent 6bc88e679a
commit 6c48ef6b45
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Src/Zle/computil.c
View file

@ -2133,6 +2133,23 @@ ca_parse_line(Cadef d, int multi, int first)
if ((adef = state.def = ca_get_arg(d, state.nth)) &&
(state.def->type == CAA_RREST ||
state.def->type == CAA_RARGS)) {
/* Bart 2009/11/17:
* We've reached the "rest" definition. If at this point
* we already found another definition that describes the
* current word, use that instead. If not, prep for the
* "narrowing" of scope to only the remaining words.
*
* We can't test ca_laststate.def in the loop conditions
* at the top because this same loop also handles the
* ':*PATTERN:MESSAGE:ACTION' form for multiple arguments
* after an option, which may need to continue scanning.
* There might be an earlier point at which this test can
* be made but tracking it down is not worth the effort.
*/
if (ca_laststate.def)
break;
state.inrest = 0;
state.opt = (cur == state.nargbeg + 1 &&
(!multi || !*line ||