1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 94b435ace..5c5d2a6ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-08-24  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* 41590 (modified as per 41595): README, Doc/Zsh/options.yo,
+	Src/exec.c, Src/init.c, Src/loop.c, Src/signals.c, Src/zsh.h,
+	Test/E01options.ztst: make ERR_RETURN work within each function
+	context, leaving ERR_EXIT global.
+
 2017-08-22  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* 41565: Functions/VCS_Info/VCS_INFO_patch2subject: vcs_info