From 8abe1496fb3577c11eb98bd57fa6162763e1b7f5 Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Fri, 21 Aug 2015 10:55:43 -0700
Subject: 36256: local options should remain in effect for "emulate -L" even if
 additional option settings are applied

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 3db846c4b..33d8ac4c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* unposted: Config/version.mk, Src/parse.c, Src/Zle/zle_misc.c:
 	update to 5.0.8-test-2 and fix some exports.
 
+2015-08-21  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* 36256: Src/builtin.c: local options should remain in effect
+	for "emulate -L" even if additional option settings are applied
+
 2015-08-21  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 36264: Src/glob.c: pathbuf is apparently metafied; document
-- 
cgit 1.4.1