diff options
| author | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-04 12:56:40 +0000 |
|---|---|---|
| committer | Sven Wischnowsky <wischnow@users.sourceforge.net> | 2000-04-04 12:56:40 +0000 |
| commit | b73476952312aa4e91432e6574665e953fef5c76 (patch) | |
| tree | 2cfdc12cda6cc7d6aeadaed8ee501636b212383e | |
| parent | 8488dcb806f8aaa3009691bcd43f0ac7c787c1ad (diff) | |
| download | zsh-b73476952312aa4e91432e6574665e953fef5c76.tar.gz zsh-b73476952312aa4e91432e6574665e953fef5c76.tar.xz zsh-b73476952312aa4e91432e6574665e953fef5c76.zip | |
fix for comparguments: completion of options after option with
rest-arguments was wrong
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Zle/computil.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ecb608ea4..8503d7f03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-04-03 Sven Wischnowsky <wischnow@informatik.hu-berlin.de> + * 10465: Src/Zle/computil.c: fix for completion of options + after option with rest-arguments + * 10463: Src/builtin.c, Src/params.c, Src/zsh.h: PM_HASHELEM flag to keep association elements from being exported with ALL_EXPORT set diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index 828fe36d0..e73fe8eaf 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -1427,7 +1427,8 @@ bin_comparguments(char *nam, char **args, char *ops, int func) if ((ca_laststate.opt || (ca_laststate.doff && ca_laststate.def) || (ca_laststate.def && (ca_laststate.def->type == CAA_OPT || - ca_laststate.def->type >= CAA_RARGS))) && + (ca_laststate.def->type >= CAA_RARGS && + ca_laststate.def->num < 0)))) && (!ca_laststate.def || ca_laststate.def->type < CAA_RARGS || (ca_laststate.def->type == CAA_RARGS ? (ca_laststate.curpos == ca_laststate.argbeg + 1) : |