From: Neil Brown <neilb@suse.de>
Date: Thu, 10 May 2012 06:44:10 +0000 (+1000)
Subject: Browser: change searchdir to -1 or +1
X-Git-Tag: v0.9~21
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=66fa6a443dcf0a3026b368ad853e0e3c8a913372;p=wiggle.git

Browser: change searchdir to -1 or +1

instead of 1 or 0.  It is less confusing that way.

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

diff --git a/vpatch.c b/vpatch.c
index e2f54cd..ee9e327 100644
--- a/vpatch.c
+++ b/vpatch.c
@@ -1428,7 +1428,7 @@ static void merge_window(struct plist *p, FILE *f, int reverse)
 		if (meta & META(0))
 			addstr("ESC...");
 		if (meta & SEARCH(0)) {
-			if (searchdir)
+			if (searchdir < 0)
 				addstr("Backwards ");
 			addstr("Search: ");
 			addstr(search);
@@ -1493,7 +1493,7 @@ static void merge_window(struct plist *p, FILE *f, int reverse)
 			meta = SEARCH(0);
 			searchlen = 0;
 			search[searchlen] = 0;
-			searchdir = 0;
+			searchdir = 1;
 			break;
 		case '\\':
 		case 'R'-64:
@@ -1501,19 +1501,19 @@ static void merge_window(struct plist *p, FILE *f, int reverse)
 			meta = SEARCH(0);
 			searchlen = 0;
 			search[searchlen] = 0;
-			searchdir = 1;
+			searchdir = -1;
 			break;
 		case SEARCH('G'-64):
 		case SEARCH('S'-64):
 		case SEARCH('R'-64):
 			/* search again */
 			if ((c|tmeta) == SEARCH('R'-64))
-				searchdir = 1;
+				searchdir = -1;
 			if ((c|tmeta) == SEARCH('S'-64))
-				searchdir = 0;
+				searchdir = 1;
 			meta = SEARCH(0);
 			tpos = pos; trow = row;
-			if (searchdir) {
+			if (searchdir < 0) {
 				trow--;
 				prev_mline(&tpos, fm, fb, fa, ci.merger, mode);
 			} else {
@@ -1565,7 +1565,7 @@ static void merge_window(struct plist *p, FILE *f, int reverse)
 					search_notfound = 0;
 					break;
 				}
-				if (searchdir) {
+				if (searchdir < 0) {
 					trow--;
 					prev_mline(&tpos, fm, fb, fa, ci.merger, mode);
 				} else {