From c1e68c35a24c508a779b80daa9a91e08e537e3c8 Mon Sep 17 00:00:00 2001 From: Bart Schaefer Date: Fri, 29 Jun 2001 05:51:08 +0000 Subject: Wayne's prepnexthistent fix for HIST_TEMPSTORE. --- ChangeLog | 13 +++++++++---- 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 +2001-06-28 Wayne Davison - * 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 @@ -21,6 +20,12 @@ * 15151: zshconfig.ac: --enable-sitefndir should be --enable-site-fndir, spotted by Jos Backus. +2001-06-28 Clint Adams + + * 15079: Completion/Unix/Command/_last, + Completion/Unix/Type/_users: last + takes other arguments than users. + 2001-06-26 Sven Wischnowsky * 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); -- cgit 1.4.1