From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-35487-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 24805 invoked by alias); 16 Jun 2015 10:36:51 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 35487
Received: (qmail 1573 invoked from network); 16 Jun 2015 10:36:48 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2
	autolearn=ham autolearn_force=no version=3.4.0
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1434450588; bh=OtHuZQS82WA/7iMlfDZImSw52nsLctbm6GmTNJw0Ovw=; h=From:To:Subject:Date:From:Subject; b=rJGXRscG123fuTVqHg9PAGCtsWf2oMU4pLQsx7FzECoxVXXZJgNhStY12TvdJ7Wc53kTjFJX5ba1nvdGIJunc31c4ldrzOCy/TOlyDqaMlflgzPahr1Mtqrk2OuPugF/BJ07xqUS3lKhCExfrFHqZ8CMDhPcyc/aA//3btbmkOsL5ePXSFWMTjAco8/iXDPvacVj10fzJl1imi0facP9UE/VumVgeixOW9k9hgHCVyDKv4rVE6PLXdgS/SeOI6ObkEWyIgISfnMOg/Rp7FOS0DF710tz8ViGwOyxNU+rOIt0ll5rZKA50r2wz31z9dplL4ldwanhMaA7UU1vGtFK8A==
X-Yahoo-Newman-Id: 869131.5268.bm@smtp139.mail.ir2.yahoo.com
X-Yahoo-Newman-Property: ymail-3
X-YMail-OSG: nHe98OEVM1n1UndyRldkvJv9S6qomfEokAo3L3v6hV3rkVB
 1eEA5Wjdm_brXarmT9x1MWmtBYD.ThyGwSvBOxdPbdhWY3weVT.F.MaWTTA6
 bv0XeXp44fp5LNVdIruTU_kGkQVxVQ1nGMGGPCPP4MmOIdilrWLbtThJxNMl
 ftGCYDoa4KolIRea0OiCKilYrhpyI39liZrK1aARbHDtpumfH1X8958xjquh
 7UJNP8FiOajkgGHQ_ez5H0p7A3h7pCaf9CotY3iB4.XMusWydbyam50BAfDb
 oUc.ZMYqMENZewCiPO_C_T8IQ8Xz6BDDHRtCL5JzrwxUb0bOeWtdiCdypKvR
 JcCPxfqflpffVmGNwFDNkigd5p7fApcIkYTsvIRud4LRWvtOtEIhHc3FjFrZ
 zS8SV94wezUKb3xVGcs71F0_nuhbMJv2xr0.nSrDANTubT7.yn1ECfZ8nSQ6
 T33M9zyYHhcK1XSQ3F4F4zKvgGPMYVUDL6cFhIqG5pzlmumFSJk_Pcqzjp_E
 FjXciFGTqOoKNtLxAziPJSBYgRSI5dSBY
X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI-
From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: Zsh workers <zsh-workers@zsh.org>
Subject: PATCH: muddled completion search status
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <23492.1434450587.1@thecus.kiddle.eu>
Date: Tue, 16 Jun 2015 12:29:47 +0200
Message-ID: <23493.1434450587@thecus.kiddle.eu>

If a completion match search is active, then cursors/tab etc are used to
select a different match and then searching is restarted, the old status
(wrapped/failed etc) is included in the status line despite the search
string being empty.

There's a further feature where if you press Ctrl-S (or whatever) again,
it will restore the last search string used. This feature is also
triggered if your next key is that for a reverse search. I found this to
be confusing. The following will only restore that last search if you do
the search twice in the same direction.

Oliver

diff --git a/Src/Zle/complist.c b/Src/Zle/complist.c
index 2c7ec58..9c5b4ec 100644
--- a/Src/Zle/complist.c
+++ b/Src/Zle/complist.c
@@ -3271,13 +3271,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;
                     }
                 } else {
 		    if (cmd == Th(z_selfinsertunmeta)) {