]> git.neil.brown.name Git - wiggle.git/commitdiff
vpatch: make ctrl-G search-again-forward, not just search-again.
authorNeilBrown <neilb@suse.de>
Tue, 13 Nov 2012 00:39:33 +0000 (11:39 +1100)
committerNeilBrown <neilb@suse.de>
Tue, 13 Nov 2012 00:39:33 +0000 (11:39 +1100)
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>
vpatch.c

index 627447573db40615aff26102141c79b0bfa916ed..0b99ac79a52d18d050d38954ce640784824d6cf2 100644 (file)
--- 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;