From c03228f9ed28dfaa9ded49eabb93c04def5ac547 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Mon, 5 Dec 2016 11:21:01 +0000
Subject: Extra case for ERR_RETURN and ERR_EXIT.

Don't trigger just because status is non-zero at end of
complex shell construct as this may be a case we've already
suppressed.
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 67f8c7687..c0afd0773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-05  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 40096: Src/exec.c, Src/loop.c, Src/zsh.h, Test/C03traps.ztst:
+	Don't trigger ERR_EXIT or ERR_RETURN on non-zero status after
+	shell construct.
+
 2016-12-04  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* unposted: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
-- 
cgit 1.4.1