From 0e4aa6f2f64fb276537adecfe755a752a3fcccb1 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Mon, 5 Dec 2016 12:29:23 +0000
Subject: Additional case for ERR_RETURN and ERR_EXIT.

Don't trigger just because status is non-zero at end of
current shell group.
---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index c0afd0773..b912821e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-12-05  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* 40097: Src/exec.c, Test/C03traps.ztst: Don't trigger ERR_EXIT
+	or ERR_RETURN on non-zero status after current shell group, either.
+
 	* 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.
-- 
cgit 1.4.1