about summary refs log tree commit diff
path: root/Src/builtin.c
diff options
context:
space:
mode:
authorTanaka Akira <akr@users.sourceforge.net>2000-03-11 00:11:02 +0000
committerTanaka Akira <akr@users.sourceforge.net>2000-03-11 00:11:02 +0000
commitd1688ca54177882828624cb5abcb3e2d727ad39f (patch)
tree487a19f44b44b278bbea83c7e62aabc15d80924d /Src/builtin.c
parentc2943574773ad1584f1d868a1a2d38266af7dde4 (diff)
downloadzsh-d1688ca54177882828624cb5abcb3e2d727ad39f.tar.gz
zsh-d1688ca54177882828624cb5abcb3e2d727ad39f.tar.xz
zsh-d1688ca54177882828624cb5abcb3e2d727ad39f.zip
zsh-workers/10059
Diffstat (limited to 'Src/builtin.c')
-rw-r--r--Src/builtin.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Src/builtin.c b/Src/builtin.c
index 60595c3bd..90ca5133c 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -1816,17 +1816,17 @@ bin_typeset(char *name, char **argv, char *ops, int func)
 
     /* Sanity checks on the options.  Remove conficting options. */
     if (on & PM_FFLOAT) {
-	off |= PM_RIGHT_B | PM_LEFT | PM_RIGHT_Z | PM_UPPER | PM_ARRAY
-	    | PM_INTEGER | PM_EFLOAT;
+	off |= PM_RIGHT_B | PM_LEFT | PM_RIGHT_Z | PM_UPPER | PM_ARRAY |
+	    PM_HASHED | PM_INTEGER | PM_EFLOAT;
 	/* Allow `float -F' to work even though float sets -E by default */
 	on &= ~PM_EFLOAT;
     }
     if (on & PM_EFLOAT)
-	off |= PM_RIGHT_B | PM_LEFT | PM_RIGHT_Z | PM_UPPER | PM_ARRAY
-	    | PM_INTEGER | PM_FFLOAT;
+	off |= PM_RIGHT_B | PM_LEFT | PM_RIGHT_Z | PM_UPPER | PM_ARRAY |
+	    PM_HASHED | PM_INTEGER | PM_FFLOAT;
     if (on & PM_INTEGER)
 	off |= PM_RIGHT_B | PM_LEFT | PM_RIGHT_Z | PM_UPPER | PM_ARRAY |
-	    PM_EFLOAT | PM_FFLOAT;
+	    PM_HASHED | PM_EFLOAT | PM_FFLOAT;
     if (on & PM_LEFT)
 	off |= PM_RIGHT_B | PM_INTEGER | PM_EFLOAT | PM_FFLOAT;
     if (on & PM_RIGHT_B)