From ebcea98eca33b8894d29545f1a46331d03f3913a Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Thu, 31 Aug 2017 16:54:19 +0100
Subject: Fix problem with ERR_RETURN.

It wasn't suppressed properly in the code following an if
in some circumstances, in particular in initialsation scripts
and also in a nested function where the caller had suppressed
it.
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 6dcbdf530..8dddd7d55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-08-31  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 41627: Src/loop.c, Test/C03traps.ztst: fix problem with
+	ERR_RETURN in initialisation scripts and also on nested
+	function involving ERR_RETURN suppression in the caller.
+
 2017-08-30  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* 41567: Completion/Unix/Command/_tmux: Complete detached
-- 
cgit v1.2.3