diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-21 21:48:09 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-21 21:48:09 +0100 |
| commit | d6357e8f93c50f984ffd69c3a0d247d8603f86c3 (patch) | |
| tree | bdbaf3d799ea65c6e31d31ab319d5abef48adb7a | |
| parent | e5f2be61595fbbba77261f3bf1e032fe03a1966d (diff) | |
| download | vim-git-d6357e8f93c50f984ffd69c3a0d247d8603f86c3.tar.gz | |
patch 7.4.1149v7.4.1149
Problem: Using the local value of 'errorformat' causes more problems than
it solves.
Solution: Revert 7.4.1013.
| -rw-r--r-- | runtime/doc/quickfix.txt | 6 | ||||
| -rw-r--r-- | src/quickfix.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt index 674470e59..5436a809a 100644 --- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -217,9 +217,9 @@ command with 'l'. :cex[pr][!] {expr} Create a quickfix list using the result of {expr} and jump to the first error. If {expr} is a String, then each new-line terminated - line in the String is processed using the value - of 'errorformat' (buffer-local value if it was set) - and the result is added to the quickfix list. + line in the String is processed using the global value + of 'errorformat' and the result is added to the + quickfix list. If {expr} is a List, then each String item in the list is processed and added to the quickfix list. Non String items in the List are ignored. diff --git a/src/quickfix.c b/src/quickfix.c index 21ac1c034..014b93df3 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -4230,10 +4230,7 @@ ex_cexpr(eap) if ((tv->v_type == VAR_STRING && tv->vval.v_string != NULL) || (tv->v_type == VAR_LIST && tv->vval.v_list != NULL)) { - char_u *efm = *curwin->w_buffer->b_p_efm == NUL ? p_efm - : curwin->w_buffer->b_p_efm; - - if (qf_init_ext(qi, NULL, NULL, tv, efm, + if (qf_init_ext(qi, NULL, NULL, tv, p_efm, (eap->cmdidx != CMD_caddexpr && eap->cmdidx != CMD_laddexpr), (linenr_T)0, (linenr_T)0, *eap->cmdlinep) > 0 diff --git a/src/version.c b/src/version.c index 792f8a746..96e0105fb 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1149, +/**/ 1148, /**/ 1147, |