about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2017-05-30 20:56:09 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2017-05-30 20:56:09 -0700
commit399a23806fc39e13a31bb4138f8589cae0706f1d (patch)
tree8aacc7937c3aa0ce891c42fbf7b4ac8b4b67ce88 /ChangeLog
parente4c33c6b1493ddeb91a91d0fa339c38bccd64f03 (diff)
parent151a4660e289c66d13b65d68ad2f10d93743d2d4 (diff)
downloadzsh-399a23806fc39e13a31bb4138f8589cae0706f1d.tar.gz
zsh-399a23806fc39e13a31bb4138f8589cae0706f1d.tar.xz
zsh-399a23806fc39e13a31bb4138f8589cae0706f1d.zip
Merge branch 'master' into schaefer/badarrays
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 15a02afa1..03592c04d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
+2017-05-26  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 41164: Src/hashtable.c, Src/hist.c, Src/zsh.h: Don't free a
+	history entry if it's the current line.  This replaces 41113.
+
 2017-05-28  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* Sebastian: 41153: Src/Modules/db_gdbm.c: finish module setup
+	only after all error conditions have been checked
+
+	* Sebastian: 41151: Src/Modules/db_gdbm.c: propagate flags when
+	creating new parameter
+
 	* unposted: Doc/Zsh/mod_complist.yo: clarify ZLS_COLORS pattern
 	matching contexts