diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2004-11-05 16:19:19 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2004-11-05 16:19:19 +0000 |
| commit | 33686bdc984f42fbf17edd3648de150beb2d2c88 (patch) | |
| tree | 4a559292e0539c127cc261fdb1ae9fd2b02738db | |
| parent | 07d95ba04c599775fa671df39ff02e50107a373f (diff) | |
| download | zsh-33686bdc984f42fbf17edd3648de150beb2d2c88.tar.gz zsh-33686bdc984f42fbf17edd3648de150beb2d2c88.tar.xz zsh-33686bdc984f42fbf17edd3648de150beb2d2c88.zip | |
fix "compadd -k assoc1 assoc2"
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 0f47b65a1..64be4b7b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ +2004-11-05 Bart Schaefer <schaefer@zsh.org> + + * 20546: Src/Zle/compcore.c: fix "compadd -k assoc1 assoc2". + 2004-11-02 Clint Adams <clint@zsh.org> - * 20539: Completion/Unix/Command/_make: avoid problems + * 20539: Completion/Unix/Command/_make: avoid problems with minus signs in expandVars(). 2004-10-29 Peter Stephenson <pws@csr.com> diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index cf821197b..8fd224bd9 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -2082,7 +2082,7 @@ addmatches(Cadata dat, char **argv) compignored++; if (dparr && !*++dparr) dparr = NULL; - continue; + goto next_array; } } if (!(dat->aflags & CAF_MATCH)) { @@ -2100,7 +2100,7 @@ addmatches(Cadata dat, char **argv) &isexact))) { if (dparr && !*++dparr) dparr = NULL; - continue; + goto next_array; } if (doadd) { Brinfo bp; @@ -2132,6 +2132,7 @@ addmatches(Cadata dat, char **argv) } free_cline(lc); } + next_array: if ((dat->aflags & CAF_ARRAYS) && !argv[1]) { Heap oldheap2; |