From: Peter Stephenson <p.w.stephenson@ntlworld.com>
To: zsh-workers@sunsite.dk (Zsh hackers list)
Subject: Re: PATCH: pattern incremental search
Date: Sat, 26 Apr 2008 21:22:55 +0100 [thread overview]
Message-ID: <200804262022.m3QKMthr028055@pws-pc.ntlworld.com> (raw)
In-Reply-To: Message from Peter Stephenson <p.w.stephenson@ntlworld.com> of "Sat, 26 Apr 2008 20:41:47 BST." <26439.1209238907@pws-pc>
Peter Stephenson wrote:
> I think this is now good enough for some beta testing, though I'm sure
> there must be glitches.
Just discovered this. I hope this is the right fix.
Index: Src/Zle/zle_hist.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_hist.c,v
retrieving revision 1.44
diff -u -r1.44 zle_hist.c
--- Src/Zle/zle_hist.c 26 Apr 2008 19:51:09 -0000 1.44
+++ Src/Zle/zle_hist.c 26 Apr 2008 20:21:50 -0000
@@ -1074,6 +1074,14 @@
*/
int revert_patpos = 0;
/*
+ * Another nasty feature related to the above. When
+ * we revert the position, we might advance the search to
+ * the same line again. When we do this the test for ignoring
+ * duplicates may trigger. This flag indicates that in this
+ * case it's OK.
+ */
+ int dup_ok = 0;
+ /*
* savekeys records the unget buffer, so that if we have arguments
* they don't pollute the input.
* feep indicates we should feep. This is a well-known word
@@ -1219,6 +1227,7 @@
* search started; see note above.
*/
revert_patpos = 0;
+ dup_ok = 1;
he = quietgethist(hl = pat_hl);
zt = GETZLETEXT(he);
pos = pat_pos;
@@ -1322,10 +1331,14 @@
hl = he->histnum;
zt = GETZLETEXT(he);
pos = (dir == 1) ? 0 : strlen(zt);
- skip_line = isset(HISTFINDNODUPS)
- ? !!(he->node.flags & HIST_DUP)
- : !strcmp(zt, last_line);
+ if (dup_ok)
+ skip_line = 0;
+ else
+ skip_line = isset(HISTFINDNODUPS)
+ ? !!(he->node.flags & HIST_DUP)
+ : !strcmp(zt, last_line);
}
+ dup_ok = 0;
/*
* If we matched above (t set), set the new line.
* If we didn't, but are here because we are on a previous
--
Peter Stephenson <p.w.stephenson@ntlworld.com>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/
next prev parent reply other threads:[~2008-04-26 20:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-26 19:41 Peter Stephenson
2008-04-26 20:22 ` Peter Stephenson [this message]
2008-04-26 20:35 ` Peter Stephenson
2008-04-26 20:51 ` Peter Stephenson
2008-04-26 23:52 ` Bart Schaefer
2008-04-28 1:35 ` Geoff Wing
[not found] ` <CAHYJk3Q5x=5Zn5kURXDDgLLoSEsro45_G=SZB-P+qX_qk7dn-Q@mail.gmail.com>
2021-12-20 3:40 ` Mikael Magnusson
2021-12-20 12:10 ` Peter Stephenson
2022-02-28 16:54 ` Madhu
2022-03-31 22:44 ` Lawrence Velázquez
2022-04-01 2:25 ` Madhu
2022-04-01 3:49 ` Bart Schaefer
2022-04-01 18:23 ` Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200804262022.m3QKMthr028055@pws-pc.ntlworld.com \
--to=p.w.stephenson@ntlworld.com \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).