Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
PATCH: Re: completion with multiple arguments for an option.
- X-seq: zsh-workers 11172
- From: Sven Wischnowsky <wischnow@xxxxxxxxxxxxxxxxxxxxxxx>
- To: zsh-workers@xxxxxxxxxxxxxx
- Subject: PATCH: Re: completion with multiple arguments for an option.
- Date: Fri, 5 May 2000 09:36:10 +0200 (MET DST)
- In-reply-to: Tanaka Akira's message of 05 May 2000 02:54:37 +0900
- Mailing-list: contact zsh-workers-help@xxxxxxxxxxxxxx; run by ezmlm
Tanaka Akira wrote:
> Z(4):akr@serein% Src/zsh -f
> serein% bindkey -e; autoload -U compinit; compinit -D
> serein% _tst () { _arguments '-o:1:(a):2:(b)' }
> serein% compdef _tst tst
> serein% tst -o <TAB>
> a b
>
> It shouldn't complete `b'.
Yep. The patch looks bigger than it is.
Bye
Sven
Index: Src/Zle/computil.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/computil.c,v
retrieving revision 1.12
diff -u -r1.12 computil.c
--- Src/Zle/computil.c 2000/05/03 14:44:01 1.12
+++ Src/Zle/computil.c 2000/05/05 07:35:20
@@ -1438,21 +1438,27 @@
if (single)
break;
- if (!opt && arg->num >= 0 && !arg->next && miss)
- arg = ca_laststate.d->rest;
- else {
- onum = arg->num;
- rest = (onum != arg->min && onum == ca_laststate.nth);
- if ((arg = arg->next)) {
- if (arg->num != onum + 1)
- miss = 1;
- } else if (rest || (oopt > 0 && !opt)) {
+ if (!opt) {
+ if (arg->num >= 0 && !arg->next && miss)
arg = ca_laststate.d->rest;
- oopt = -1;
+ else {
+ onum = arg->num;
+ rest = (onum != arg->min && onum == ca_laststate.nth);
+ if ((arg = arg->next)) {
+ if (arg->num != onum + 1)
+ miss = 1;
+ } else if (rest || (oopt > 0 && !opt)) {
+ arg = ca_laststate.d->rest;
+ oopt = -1;
+ }
}
+ } else {
+ if (!lopt)
+ break;
+ arg = arg->next;
}
}
- if (!single && opt && lopt) {
+ if (!single && opt && (lopt || ca_laststate.oopt)) {
opt = NULL;
arg = ca_get_arg(ca_laststate.d, ca_laststate.nth);
--
Sven Wischnowsky wischnow@xxxxxxxxxxxxxxxxxxxxxxx
Messages sorted by:
Reverse Date,
Date,
Thread,
Author