about summary refs log tree commit diff
path: root/Src/exec.c
diff options
context:
space:
mode:
authorPhilippe Altherr <philippe.altherr@gmail.com>2022-12-03 20:31:42 -0800
committerBart Schaefer <schaefer@zsh.org>2022-12-03 20:31:42 -0800
commit23dc19f005b6a9ac0740b46155f14dbcfa697421 (patch)
treea56440ef1175b92685b07162a45c8f5d76228bb8 /Src/exec.c
parent41b402d36d0aeac594cf424a9e46b5edb20c815d (diff)
downloadzsh-23dc19f005b6a9ac0740b46155f14dbcfa697421.tar.gz
zsh-23dc19f005b6a9ac0740b46155f14dbcfa697421.tar.xz
zsh-23dc19f005b6a9ac0740b46155f14dbcfa697421.zip
51001: Reverts 8839e969b, most of 1ba8714a, and d873ed60.
Also correct ChangeLog
Diffstat (limited to 'Src/exec.c')
-rw-r--r--Src/exec.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/Src/exec.c b/Src/exec.c
index ce0c1f1ad..b0f42ae67 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -451,7 +451,7 @@ execcursh(Estate state, int do_exec)
     cmdpop();
 
     state->pc = end;
-    this_noerrexit = (WC_SUBLIST_TYPE(*end) != WC_SUBLIST_END);
+    this_noerrexit = 1;
 
     return lastval;
 }
@@ -1442,8 +1442,6 @@ execlist(Estate state, int dont_change_job, int exiting)
 		    execsimple(state);
 		else
 		    execpline(state, code, ltype, (ltype & Z_END) && exiting);
-		if (!locallevel || unset(ERRRETURN))
-		    this_noerrexit = noerrexit;
 		state->pc = next;
 		goto sublist_done;
 		break;