about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2003-05-24 22:46:35 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2003-05-24 22:46:35 +0000
commit10be59abca92fc2990a4f3985007b81f34fc2fcd (patch)
tree2cba3e7b16ca2623fd40adf2250e7c111960b531 /Src
parent46557b1e1c5dbfbc22e09bffb405b7f89e6cbc48 (diff)
downloadzsh-10be59abca92fc2990a4f3985007b81f34fc2fcd.tar.gz
zsh-10be59abca92fc2990a4f3985007b81f34fc2fcd.tar.xz
zsh-10be59abca92fc2990a4f3985007b81f34fc2fcd.zip
18578: 18559 caused typeset failures
Diffstat (limited to 'Src')
-rw-r--r--Src/builtin.c6
1 files changed, 3 insertions, 3 deletions
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;