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

Rebase against master.

Browse source
This commit is contained in:
LemonBoy 2016-06-19 21:08:25 +02:00 • committed by Ailin Nemui
commit 5eaead761f
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/ignore.c
View file

@ -66,8 +66,10 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text)
if (text == NULL) if (text == NULL)
return FALSE; return FALSE;
if (rec->regexp) if (rec->regexp) {
return rec->preg && g_regex_match(rec->preg, text, 0, NULL); return rec->preg != NULL &&
g_regex_match(rec->preg, text, 0, NULL);
}
return rec->fullword ? return rec->fullword ?
stristr_full(text, rec->pattern) != NULL : stristr_full(text, rec->pattern) != NULL :

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

@ -570,7 +570,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
textbuffer_line2text(line, FALSE, str); textbuffer_line2text(line, FALSE, str);
if (line_matched) { if (line_matched) {
line_matched = regexp ? line_matched = regexp ?
g_regex_match(preg, str->str, 0, NULL) : g_regex_match(preg, str->str, 0, NULL) :
match_func(str->str, text) != NULL; match_func(str->str, text) != NULL;
} }