Permalink
Browse files

patch 8.1.0169: calling message_filtered() a bit too often

Problem:    Calling message_filtered() a bit too often.
Solution:   Only call message_filtered() when filtering is already false.
  • Loading branch information...
brammool committed Jul 8, 2018
1 parent 9d5185b commit a9defadb8f03ecd03f3297305d5482ba380774dc
Showing with 15 additions and 6 deletions.
  1. +5 −1 runtime/doc/quickfix.txt
  2. +8 −5 src/quickfix.c
  3. +2 −0 src/version.c
@@ -298,6 +298,10 @@ processing a quickfix or location list command, it will be aborted.
from the last error backwards, -1 being the last error.
The 'switchbuf' settings are respected when jumping
to a buffer.
The |:filter| command can be used to display only the
quickfix entries matching a supplied pattern. The
pattern is matched against the filename, module name,
pattern and text of the entry.

:cl[ist] +{count} List the current and next {count} valid errors. This
is similar to ":clist from from+count", where "from"
@@ -1287,7 +1291,7 @@ to the file.
Changing directory

The following uppercase conversion characters specify the type of special
format strings. At most one of them may be given as a prefix at the begin
format strings. At most one of them may be given as a prefix at the beginning
of a single comma-separated format pattern.
Some compilers produce messages that consist of directory names that have to
be prepended to each file name read by %f (example: GNU make). The following
@@ -3139,18 +3139,21 @@ qf_list(exarg_T *eap)
sprintf((char *)IObuff, "%2d", i);
else
vim_snprintf((char *)IObuff, IOSIZE, "%2d %s",
i, (char *)fname);
i, (char *)fname);
}

// Support for filtering entries using :filter /pat/ clist
filter_entry = 1;
// Match against the module name, file name, search pattern and
// text of the entry.
filter_entry = TRUE;
if (qfp->qf_module != NULL && *qfp->qf_module != NUL)
filter_entry &= message_filtered(qfp->qf_module);
if (fname != NULL)
if (filter_entry && fname != NULL)
filter_entry &= message_filtered(fname);
if (qfp->qf_pattern != NULL)
if (filter_entry && qfp->qf_pattern != NULL)
filter_entry &= message_filtered(qfp->qf_pattern);
filter_entry &= message_filtered(qfp->qf_text);
if (filter_entry)
filter_entry &= message_filtered(qfp->qf_text);
if (filter_entry)
goto next_entry;

@@ -789,6 +789,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
169,
/**/
168,
/**/

0 comments on commit a9defad

Please sign in to comment.