vim-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.
a9defadb8f
This commit is contained in:
Jan Edmund Lazo 2019-06-22 06:28:49 -04:00
parent bb02ca6def
commit 3a49fa8f8b
2 changed files with 9 additions and 5 deletions

View File

@ -1257,7 +1257,7 @@ to the file.
Changing directory Changing directory
The following uppercase conversion characters specify the type of special 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. of a single comma-separated format pattern.
Some compilers produce messages that consist of directory names that have to 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 be prepended to each file name read by %f (example: GNU make). The following

View File

@ -2551,17 +2551,21 @@ void qf_list(exarg_T *eap)
} }
// Support for filtering entries using :filter /pat/ clist // Support for filtering entries using :filter /pat/ clist
int filter_entry = 1; // Match against the module name, file name, search pattern and
// text of the entry.
bool filter_entry = true;
if (qfp->qf_module != NULL && *qfp->qf_module != NUL) { if (qfp->qf_module != NULL && *qfp->qf_module != NUL) {
filter_entry &= message_filtered(qfp->qf_module); filter_entry &= message_filtered(qfp->qf_module);
} }
if (fname != NULL) { if (filter_entry && fname != NULL) {
filter_entry &= message_filtered(fname); 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_pattern);
} }
filter_entry &= message_filtered(qfp->qf_text); if (filter_entry) {
filter_entry &= message_filtered(qfp->qf_text);
}
if (filter_entry) { if (filter_entry) {
goto next_entry; goto next_entry;
} }