diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-07-08 18:20:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-07-08 18:20:24 +0200 |
| commit | a9defadb8f03ecd03f3297305d5482ba380774dc (patch) | |
| tree | f0704b96b325905e34b8a5241ce21ec747cdcf26 | |
| parent | 9d5185bf9dfaef59e47c573a60044a21d5e29c0c (diff) | |
| download | vim-git-a9defadb8f03ecd03f3297305d5482ba380774dc.tar.gz | |
patch 8.1.0169: calling message_filtered() a bit too oftenv8.1.0169
Problem: Calling message_filtered() a bit too often.
Solution: Only call message_filtered() when filtering is already false.
| -rw-r--r-- | runtime/doc/quickfix.txt | 6 | ||||
| -rw-r--r-- | src/quickfix.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index c3f850437..2955edac9 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -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 diff --git a/src/quickfix.c b/src/quickfix.c index e7e34e4be..f758980b4 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -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; diff --git a/src/version.c b/src/version.c index ce1c55bd5..2b33f537d 100644 --- a/src/version.c +++ b/src/version.c @@ -790,6 +790,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 169, +/**/ 168, /**/ 167, |