summary refs log tree commit diff
path: root/Src/exec.c
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2017-08-27 20:28:38 +0100
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2017-08-29 19:52:18 +0100
commit7d1877da4e6fabde8f0b5eb2f9a9f03d83e6c28d (patch)
tree04cd41bdb22033f01fbd04f6e6b691a15f400108 /Src/exec.c
parent8b4d2329c71377fcab7d73bc0656094557c720a9 (diff)
downloadzsh-7d1877da4e6fabde8f0b5eb2f9a9f03d83e6c28d.tar.gz
zsh-7d1877da4e6fabde8f0b5eb2f9a9f03d83e6c28d.tar.xz
zsh-7d1877da4e6fabde8f0b5eb2f9a9f03d83e6c28d.zip
41608 (plus tests): restore ERR_EXIT before function.
There was an exception to the usual ERR_EXIT pattern that causes
problems when executing a function in an else branch.  It seems
the exception is no longer needed as the regression tests pass
without it.
Diffstat (limited to 'Src/exec.c')
-rw-r--r--Src/exec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Src/exec.c b/Src/exec.c
index cd99733f1..76a6bb1a4 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -3025,7 +3025,7 @@ execcmd_exec(Estate state, Execcmd_params eparams,
 	preargs = NULL;
 
     /* if we get this far, it is OK to pay attention to lastval again */
-    if ((noerrexit & NOERREXIT_UNTIL_EXEC) && !is_shfunc)
+    if (noerrexit & NOERREXIT_UNTIL_EXEC)
 	noerrexit = 0;
 
     /* Do prefork substitutions.