take tog selection cursor position into account when searching for next match Patch by Mikhail ok op@ jamsek
diff --git a/tog/tog.c b/tog/tog.c
index a3b1cc5..9cd42f9 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -2342,11 +2342,25 @@ 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 user has moved cursor after we hit the match, position
+ * from where we should continue search must be changed.
+ */
if (view->searching == TOG_SEARCH_FORWARD)
- entry = TAILQ_NEXT(s->matched_entry, entry);
+ if (matched_idx > selected_idx)
+ entry = TAILQ_NEXT(s->selected_entry, entry);
+ else
+ entry = TAILQ_NEXT(s->matched_entry, entry);
else
- entry = TAILQ_PREV(s->matched_entry,
- commit_queue_head, entry);
+ 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);
} else {
entry = s->selected_entry;
}