diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2003-05-24 22:46:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2003-05-24 22:46:35 +0000 |
| commit | 10be59abca92fc2990a4f3985007b81f34fc2fcd (patch) | |
| tree | 2cba3e7b16ca2623fd40adf2250e7c111960b531 | |
| parent | 46557b1e1c5dbfbc22e09bffb405b7f89e6cbc48 (diff) | |
| download | zsh-10be59abca92fc2990a4f3985007b81f34fc2fcd.tar.gz zsh-10be59abca92fc2990a4f3985007b81f34fc2fcd.tar.xz zsh-10be59abca92fc2990a4f3985007b81f34fc2fcd.zip | |
18578: 18559 caused typeset failures
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Src/builtin.c | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index c996cb436..ec8b99b2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-05-24 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> + + * 18578: Src/builtin.c: changet to OPT_ISSET() in 18559 + affected some tests which should have been using OPT_PLUS(). + 2003-05-22 Peter Stephenson <pws@csr.com> * 18569: Src/subst.c: error with numeric sorting of parameters; @@ -83,7 +88,7 @@ Completion/Unix/Command/_ssh: get hostname from IPREFIX instead of words[CURRENT] to avoid quote characters - * MichaÅ‚ Politowski: users/6080: Completion/Unix/Command/_ssh: + * Michał Politowski: users/6080: Completion/Unix/Command/_ssh: remove one level of quoting on files before using with remote ls 2003-05-07 Peter Stephenson <pws@csr.com> @@ -986,7 +991,7 @@ * unposted: Completion/Unix/Command/_lynx, Completion/Unix/Command/_links: minor bug fix (missing -g) - * Thomas Köhler: 17610: Completion/Unix/Command/_ssh: also pass + * Thomas Köhler: 17610: Completion/Unix/Command/_ssh: also pass through -F option * 17607: Completion/Unix/Command/_ssh: pass through options such as diff --git a/Src/builtin.c b/Src/builtin.c index 96ed1e61b..f8a713152 100644 --- a/Src/builtin.c +++ b/Src/builtin.c @@ -2145,7 +2145,7 @@ bin_typeset(char *name, char **argv, Options ops, int func) } if (!(OPT_ISSET(ops,'g') || OPT_ISSET(ops,'x') || OPT_ISSET(ops,'m')) || - OPT_ISSET(ops,'g') == 2 || *name == 'l' || + OPT_PLUS(ops,'g') || *name == 'l' || (!isset(GLOBALEXPORT) && !OPT_ISSET(ops,'g'))) on |= PM_LOCAL; @@ -2263,7 +2263,7 @@ bin_typeset(char *name, char **argv, Options ops, int func) returnval = 1; continue; } - if (OPT_PLUS(ops,'m') == 2 && !asg->value) { + if (OPT_PLUS(ops,'m') && !asg->value) { scanmatchtable(paramtab, pprog, on|roff, 0, paramtab->printnode, printflags); continue; @@ -2351,7 +2351,7 @@ bin_functions(char *name, char **argv, Options ops, int func) int on = 0, off = 0, pflags = 0; /* Do we have any flags defined? */ - if (OPT_ISSET(ops,'u') == 2) + if (OPT_PLUS(ops,'u')) off |= PM_UNDEFINED; else if (OPT_MINUS(ops,'u') || OPT_ISSET(ops,'X')) on |= PM_UNDEFINED; |