diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2009-08-15 16:59:21 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2009-08-15 16:59:21 +0000 |
| commit | 2237f7376e4259eb068399a2baa56d246d038dae (patch) | |
| tree | 5c41edb551238d03dd793906216209d02f14fae6 | |
| parent | c2ff7a83dab4eda61308079b2d72daee0b83ff6f (diff) | |
| download | zsh-2237f7376e4259eb068399a2baa56d246d038dae.tar.gz zsh-2237f7376e4259eb068399a2baa56d246d038dae.tar.xz zsh-2237f7376e4259eb068399a2baa56d246d038dae.zip | |
users/14307: end of command line in completion with variant zsh syntax
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 3294a609c..ba9541c94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-08-15 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * users/14307: Src/Zle/zle_tricky.c: end of current command in + completion wasn't properly found when using variant zsh loop + or test syntax. + 2009-08-07 Peter Stephenson <pws@csr.com> * Andrew Psaltis: 27212: Completion/Linux/Command/_pkgtool: @@ -12070,5 +12076,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.4758 $ +* $Revision: 1.4759 $ ***************************************************** diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 1fcb4dee6..1856911dc 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1211,7 +1211,15 @@ get_comp_string(void) (ins == 2 && i == 2) || (ins == 3 && i == 3) || tok == BAR || tok == AMPER || tok == BARAMP || tok == AMPERBANG || - ((tok == DBAR || tok == DAMPER) && !incond)) { + ((tok == DBAR || tok == DAMPER) && !incond) || + /* + * Special case: we might reach a new command (incmdpos set) + * if we've already found the string we're completing (tt set) + * without hitting one of the above if we're using one of + * the special zsh forms of delimiting for conditions and + * loops that I really loathe having to support. + */ + (tt && incmdpos)) { /* This is one of the things that separate commands. If we * * already have the things we need (e.g. the token strings), * * leave the loop. */ |