about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-04-26 20:27:39 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-04-26 20:27:39 +0000
commit35bbbbacb64c49e9fed1a32d3044dca4b91fa523 (patch)
treebea6646c5f03199e079761cf757ace73ba923f96 /Src
parent234c6ed193fb61379d8d7bb1ee44793ed75e15fb (diff)
downloadzsh-35bbbbacb64c49e9fed1a32d3044dca4b91fa523.tar.gz
zsh-35bbbbacb64c49e9fed1a32d3044dca4b91fa523.tar.xz
zsh-35bbbbacb64c49e9fed1a32d3044dca4b91fa523.zip
24879: unpleasantness at the pattern search line duplication test club
Diffstat (limited to 'Src')
-rw-r--r--Src/Zle/zle_hist.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c
index 281de2e3b..ce3c284ca 100644
--- a/Src/Zle/zle_hist.c
+++ b/Src/Zle/zle_hist.c
@@ -1074,6 +1074,14 @@ doisearch(char **args, int dir, int pattern)
      */
     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 @@ doisearch(char **args, int dir, int pattern)
 				     * 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 @@ doisearch(char **args, int dir, int pattern)
 		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