From 0a0ba5e6641a8a78d745928e5738c95cc5353ee0 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Thu, 18 Jun 2015 23:55:45 +0200 Subject: 35487, 35496: don't reinstate previous incremental search string when search direction changes --- Src/Zle/complist.c | 4 +++- Src/Zle/zle_hist.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'Src') diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c index a02a5c37b..39c0c314d 100644 --- a/Src/Zle/complist.c +++ b/Src/Zle/complist.c @@ -3287,13 +3287,15 @@ domenuselect(Hookdef dummy, Chdata dat) } if (!ins) { if (was) { - if (!*msearchstr && lastsearch) { + if (!*msearchstr && lastsearch && + back == (mode == MM_BSEARCH)) { msearchstr = dupstring(lastsearch); mode = 0; } } else { msearchstr = ""; msearchstack = NULL; + msearchstate = MS_OK; } } if (cmd == Th(z_selfinsertunmeta)) { diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c index cc66f99ae..0b3b9e7b7 100644 --- a/Src/Zle/zle_hist.c +++ b/Src/Zle/zle_hist.c @@ -1598,7 +1598,7 @@ doisearch(char **args, int dir, int pattern) dir = odir; skip_pos = 1; rpt: - if (!sbptr && previous_search_len) { + if (!sbptr && previous_search_len && dir == odir) { if (previous_search_len > sibuf - FIRST_SEARCH_CHAR - 2) { ibuf = hrealloc((char *)ibuf, sibuf, (sibuf + previous_search_len)); -- cgit 1.4.1