mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-24 05:11:08 +02:00
39026: pattern specified with _arguments' -A option shouldn't be checked against words after the cursor
This commit is contained in:
parent
a1a58dde6a
commit
f760bd6064
2 changed files with 9 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2016-08-13 Oliver Kiddle <opk@zsh.org>
|
||||||
|
|
||||||
|
* 39026: Src/Zle/computil.c: pattern specified with _arguments'
|
||||||
|
-A option shouldn't be checked against words after the cursor
|
||||||
|
|
||||||
2016-08-12 Barton E. Schaefer <schaefer@zsh.org>
|
2016-08-12 Barton E. Schaefer <schaefer@zsh.org>
|
||||||
|
|
||||||
* 39035: Src/subst.c, Test/D04parameter.ztst: ${(A)name=word}
|
* 39035: Src/subst.c, Test/D04parameter.ztst: ${(A)name=word}
|
||||||
|
|
|
@ -2167,9 +2167,11 @@ ca_parse_line(Cadef d, int multi, int first)
|
||||||
#endif
|
#endif
|
||||||
)
|
)
|
||||||
return 1;
|
return 1;
|
||||||
else if (state.arg && (!napat || !pattry(napat, line))) {
|
else if (state.arg &&
|
||||||
|
(!napat || cur <= compcurrent || !pattry(napat, line))) {
|
||||||
/* Otherwise it's a normal argument. */
|
/* Otherwise it's a normal argument. */
|
||||||
if (napat && ca_inactive(d, NULL, cur + 1, 1, NULL))
|
if (napat && cur <= compcurrent &&
|
||||||
|
ca_inactive(d, NULL, cur + 1, 1, NULL))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
arglast = 1;
|
arglast = 1;
|
||||||
|
|
Loading…
Reference in a new issue