diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-04-26 21:12:02 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-04-26 21:12:02 +0100 |
| commit | 9cd7ffe529981d9c1520a323b542a41eedbddc14 (patch) | |
| tree | 0032971202cec1e678dd616fe25516fd339c17ea /ChangeLog | |
| parent | 7b1b1dbb453cfa78288ee93ce5fb972c68f67298 (diff) | |
| parent | 979f72199f3d3e98b1f6c712fa26f731dac2cb51 (diff) | |
| download | zsh-9cd7ffe529981d9c1520a323b542a41eedbddc14.tar.gz zsh-9cd7ffe529981d9c1520a323b542a41eedbddc14.tar.xz zsh-9cd7ffe529981d9c1520a323b542a41eedbddc14.zip | |
Fix merge conflict
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 2cf2df900..0dcbf3e75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,13 @@ * Jasper Lievisse Adriaanse: 32558: configure.ac: _XOPEN_SOURCE_EXTENDED now works OK on OpenBSD. +2014-04-25 Barton E. Schaefer <schaefer@zsh.org> + + * 32580: Src/hist.c: avoid indefinite wait in lockhistfile() by + checking for lock file time stamp far in the future relative to + the local clock. Change behavior of HIST_FCNTL_LOCK to use only + fcntl() locking, rather than applying both kinds of lock. + 2014-04-20 Barton E. Schaefer <schaefer@zsh.org> * 32569: Src/loop.c: lastval ($?) should not be reset between |