unposted: more tweaks for failed isearch pattern matches

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9eb3f4523..2e8ca9046 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-28  Peter Stephenson  <pws@csr.com>
 
+	* unposted: Src/Zle/zle_hist.c: more tweaks for failures with
+	isearch pattern matching.
+
 	* 24890: Matt Wozniski: Src/Zle/zle_hist.c: skip_pos was
 	staying set causing random failures on backtracking in isearch.
 
diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c
index bc3cdf634..be52210cc 100644
--- a/Src/Zle/zle_hist.c
+++ b/Src/Zle/zle_hist.c
@@ -1197,6 +1197,7 @@ doisearch(char **args, int dir, int pattern)
 		}
 		if (patprog) {
 		    revert_patpos = 1;
+		    skip_pos = 0;
 		} else {
 		    if (nomatch != 2) {
 			handlefeep(zlenoargs);
@@ -1342,7 +1343,7 @@ doisearch(char **args, int dir, int pattern)
 		    get_isrch_spot(top_spot, &hl, &pos, &pat_hl, &pat_pos,
 				   &end_pos, &zlemetacs, &sbptr, &dir,
 				   &nomatch);
-		    if (!nomatch) {
+		    if (nomatch != 1) {
 			feep = 1;
 			nomatch = 1;
 		    }