summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Src/exec.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 84fa900ee..30f1742a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-18 Peter Stephenson <p.w.stephenson@ntlworld.com>
+
+ * 31846: Src/exec.c: fix NOEXEC option in execsimple().
+
2013-10-18 Barton E. Schaefer <schaefer@zsh.org>
* 31840: Completion/Unix/Command/_make: "read" used wrong $IFS
diff --git a/Src/exec.c b/Src/exec.c
index 8efbbd40c..e95cad300 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -1087,6 +1087,9 @@ execsimple(Estate state)
if (errflag)
return (lastval = 1);
+ if (!isset(EXECOPT))
+ return lastval = 0;
+
/* In evaluated traps, don't modify the line number. */
if (!IN_EVAL_TRAP() && !ineval && code)
lineno = code - 1;