From: NeilBrown <neilb@suse.de>
Date: Tue, 13 Nov 2012 00:39:33 +0000 (+1100)
Subject: vpatch: make ctrl-G search-again-forward, not just search-again.
X-Git-Tag: v1.0~101
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=7d36df944b65a2d4b0116e529a8d3f07893cfeb9;p=wiggle.git

vpatch: make ctrl-G search-again-forward, not just search-again.

As ctrl-S doesn't work (as I haven't enabled 'raw' mode), you cannot
search forward during a reverse search.  So change ctrl-G to do that
rather than search-again-in-current-direction, which isn't really useful.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/vpatch.c b/vpatch.c
index 6274475..0b99ac7 100644
--- a/vpatch.c
+++ b/vpatch.c
@@ -1575,10 +1575,8 @@ static void merge_window(struct plist *p, FILE *f, int reverse)
 			/* search again */
 			if ((c|tmeta) == SEARCH('R'-64))
 				searchdir = -2;
-			else if ((c|tmeta) == SEARCH('S'-64))
-				searchdir = 2;
 			else
-				searchdir *= 2;
+				searchdir = 2;
 			meta = SEARCH(0);
 			tpos = pos; trow = row;
 			goto search_again;