zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-09 11:50:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into regexex

Browse source
This commit is contained in:
ailin-nemui 2017-06-19 11:06:24 +02:00 • committed by GitHub
commit 1fc170ee11
7 changed files with 42 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/fe-text/textbuffer.c
View file

@ -590,27 +590,30 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
pre_line = line;
for (i = 0; i < before; i++) {
if (pre_line->prev == NULL ||
g_list_find(matches, pre_line->prev) != NULL)
g_list_nth_data(matches, 0) == pre_line->prev ||
g_list_nth_data(matches, 1) == pre_line->prev)
break;
pre_line = pre_line->prev;
}
for (; pre_line != line; pre_line = pre_line->next)
matches = g_list_append(matches, pre_line);
matches = g_list_prepend(matches, pre_line);
match_after = after;
}
if (line_matched || match_after > 0) {
/* matched */
matches = g_list_append(matches, line);
matches = g_list_prepend(matches, line);
if ((!line_matched && --match_after == 0) ||
(line_matched && match_after == 0 && before > 0))
matches = g_list_append(matches, NULL);
matches = g_list_prepend(matches, NULL);
}
}
matches = g_list_reverse(matches);
if (preg != NULL)
i_regex_unref(preg);
g_string_free(str, TRUE);