about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2007-06-15 10:20:35 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2007-06-15 10:20:35 +0000
commit536a8cb6daf78850d0bc336b0edffe75ae00304f (patch)
tree2983534b571ce16fb6afef45daa5469eb306ab69
parent6f7667ba8c7b7d4345a459695e35976c28f34c49 (diff)
downloadzsh-536a8cb6daf78850d0bc336b0edffe75ae00304f.tar.gz
zsh-536a8cb6daf78850d0bc336b0edffe75ae00304f.tar.xz
zsh-536a8cb6daf78850d0bc336b0edffe75ae00304f.zip
23553: bit missed out
-rw-r--r--ChangeLog2
-rw-r--r--Src/exec.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a3c2bef99..9ac8d399b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2007-06-15  Peter Stephenson  <pws@csr.com>
 
 	* 23553: Doc/Zsh/arith.yo, Doc/Zsh/builtins.yo, Src/exec.c,
-	Src/math.c: should have been committed but wasn't.
+	Src/math.c: should have been committed but weren't.
 
 2007-06-14  Peter Stephenson  <pws@csr.com>
 
diff --git a/Src/exec.c b/Src/exec.c
index 7e4b55d43..0aee2d6a9 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -3662,7 +3662,10 @@ execarith(Estate state, UNUSED(int do_exec))
 	fprintf(xtrerr, " ))\n");
 	fflush(xtrerr);
     }
-    errflag = 0;
+    if (errflag) {
+	errflag = 0;
+	return 2;
+    }
     /* should test for fabs(val.u.d) < epsilon? */
     return (val.type == MN_INTEGER) ? val.u.l == 0 : val.u.d == 0.0;
 }