diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2008-09-29 20:56:23 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2008-09-29 20:56:23 +0000 |
| commit | 29db898a6d5eb41b4e3c8624bd1356d02571f5f0 (patch) | |
| tree | b1fd876cb963d1a6e9491525dfc930c0a10ff0c4 | |
| parent | 773800e0de3598707dca49eb8206d6e38ca654aa (diff) | |
| download | zsh-29db898a6d5eb41b4e3c8624bd1356d02571f5f0.tar.gz zsh-29db898a6d5eb41b4e3c8624bd1356d02571f5f0.tar.xz zsh-29db898a6d5eb41b4e3c8624bd1356d02571f5f0.zip | |
25774: fix in 25772 was applied too widely
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/params.c | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index b50654079..660088c50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-09-29 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 25774: Src/params.c: fix in 25772 was applied too widely. + 2008-09-29 Peter Stephenson <pws@csr.com> * 25733: Completion/Zsh/Context/.distfiles, diff --git a/Src/params.c b/Src/params.c index 379d90729..65b3ecff8 100644 --- a/Src/params.c +++ b/Src/params.c @@ -1302,16 +1302,18 @@ getarg(char **str, int *inv, Value v, int a2, zlong *w, if (v->isarr) { if (ishash) { - if (!pprog) - return 1; scanprog = pprog; scanstr = s; if (keymatch) v->isarr |= SCANPM_KEYMATCH; - else if (ind) - v->isarr |= SCANPM_MATCHKEY; - else - v->isarr |= SCANPM_MATCHVAL; + else { + if (!pprog) + return 1; + if (ind) + v->isarr |= SCANPM_MATCHKEY; + else + v->isarr |= SCANPM_MATCHVAL; + } if (down) v->isarr |= SCANPM_MATCHMANY; if ((ta = getvaluearr(v)) && |