aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

Do not require that a line matches the input level to add it to the

Browse Source 
'after' context, so that '/lastlog -hilight -after 10 foo' has the same
semantic as '/lastlog -hilight -before 10 foo'.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4570 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2007-06-28 22:50:58 +00:00 committed by exg
parent bc45b39030
commit 566f6d24be
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fe-text/textbuffer.c
View File

@ -463,7 +463,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
g_return_val_if_fail(buffer != NULL, NULL);
g_return_val_if_fail(text != NULL, NULL);
if (regexp && *text != '\0') {
if (regexp) {
#ifdef HAVE_REGEX_H
int flags = REG_EXTENDED | REG_NOSUB |
(case_sensitive ? 0 : REG_ICASE);
@ -480,19 +480,21 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
line = startline != NULL ? startline : buffer->first_line;
for (; line != NULL; line = line->next) {
if ((line->info.level & level) == 0 ||
(line->info.level & nolevel) != 0)
continue;
line_matched = (line->info.level & level) != 0 &&
(line->info.level & nolevel) == 0;
if (*text == '\0') {
/* no search word, everything matches */
textbuffer_line_ref(line);
matches = g_list_append(matches, line);
if (line_matched) {
textbuffer_line_ref(line);
matches = g_list_append(matches, line);
}
continue;
}
textbuffer_line2text(line, FALSE, str);
if (line_matched)
line_matched =
#ifdef HAVE_REGEX_H
regexp ? regexec(&preg, str->str, 0, NULL, 0) == 0 :