diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2001-06-29 05:51:08 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2001-06-29 05:51:08 +0000 |
| commit | c1e68c35a24c508a779b80daa9a91e08e537e3c8 (patch) | |
| tree | 21507ea39bee2eac23087bb003b8fe09b2364bb0 | |
| parent | 80c9e0d083abb1583aefded41c06f25ccfefdf55 (diff) | |
| download | zsh-c1e68c35a24c508a779b80daa9a91e08e537e3c8.tar.gz zsh-c1e68c35a24c508a779b80daa9a91e08e537e3c8.tar.xz zsh-c1e68c35a24c508a779b80daa9a91e08e537e3c8.zip | |
Wayne's prepnexthistent fix for HIST_TEMPSTORE.
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Src/hist.c | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index f0fa3f9fd..f202b72cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,7 @@ -2001-06-28 Clint Adams <clint@zsh.org> +2001-06-28 Wayne Davison <wayned@users.sourceforge.net> - * 15079: Completion/Unix/Command/_last, - Completion/Unix/Type/_users: last - takes other arguments than users. + * 15172: Src/hist.c: Have prepnexthistent() remove any HIST_TEMPSTORE + entry that is present. 2001-06-28 Peter Stephenson <pws@csr.com> @@ -21,6 +20,12 @@ * 15151: zshconfig.ac: --enable-sitefndir should be --enable-site-fndir, spotted by Jos Backus. +2001-06-28 Clint Adams <clint@zsh.org> + + * 15079: Completion/Unix/Command/_last, + Completion/Unix/Type/_users: last + takes other arguments than users. + 2001-06-26 Sven Wischnowsky <wischnow@zsh.org> * user/3946: Src/Zle/computil.c: fix for finding the first diff --git a/Src/hist.c b/Src/hist.c index 5b0fe0309..842863992 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -922,6 +922,10 @@ prepnexthistent(void) if (curline_in_ring) unlinkcurline(); + if (hist_ring && hist_ring->flags & HIST_TMPSTORE) { + curhist--; + freehistnode((HashNode)hist_ring); + } if (histlinect < histsiz) { he = (Histent)zcalloc(sizeof *he); |