commit e7baaec8113dd8e2b22320006a167ffc6ff39d84
from: Mikhail <mp39590@gmail.com>
via: Thomas Adam <thomas@xteddy.org>
date: Tue Sep 13 10:24:47 2022 UTC

tog: respect current cursor position during log search

ok op@

commit - 8e396e197251d88be969784fc4fa54732b4230a7
commit + e7baaec8113dd8e2b22320006a167ffc6ff39d84
blob - 207d3e82d10375387f550c0dab109b1a1ccd2039
blob + a91052e62a771beacec27096fd006132b40c0ff3
--- tog/tog.c
+++ tog/tog.c
@@ -3121,27 +3121,16 @@ search_next_log_view(struct tog_view *view)
 			entry = TAILQ_PREV(s->search_entry,
 			    commit_queue_head, entry);
 	} else if (s->matched_entry) {
-		int matched_idx = s->matched_entry->idx;
-		int selected_idx = s->selected_entry->idx;
-
 		/*
 		 * If the user has moved the cursor after we hit a match,
 		 * the position from where we should continue searching
 		 * might have changed.
 		 */
-		if (view->searching == TOG_SEARCH_FORWARD) {
-			if (matched_idx > selected_idx)
-				entry = TAILQ_NEXT(s->selected_entry, entry);
-			else
-				entry = TAILQ_NEXT(s->matched_entry, entry);
-		} else {
-			if (matched_idx < selected_idx)
-				entry = TAILQ_PREV(s->selected_entry,
-						commit_queue_head, entry);
-			else
-				entry = TAILQ_PREV(s->matched_entry,
-						commit_queue_head, entry);
-		}
+		if (view->searching == TOG_SEARCH_FORWARD)
+			entry = TAILQ_NEXT(s->selected_entry, entry);
+		else
+			entry = TAILQ_PREV(s->selected_entry, commit_queue_head,
+			    entry);
 	} else {
 		entry = s->selected_entry;
 	}