diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-31 21:19:49 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-31 21:19:49 +0100 |
| commit | 9b05a0d0f94d8c4c1ddd51e7f31b73f7556bdbdc (patch) | |
| tree | 0c1c6323e591bb57a426522162164e1222c6dd48 /src | |
| parent | 1000565c3a2439c9a7c9759284814dbf3b8bc20d (diff) | |
| download | vim-9b05a0d0f94d8c4c1ddd51e7f31b73f7556bdbdc.zip | |
patch 7.4.1013
Problem: The local value of 'errorformat' is not used for ":lexpr" and
":cexpr".
Solution: Use the local value if it exists. (Christian Brabandt) Adjust the
help for this.
Diffstat (limited to 'src')
| -rw-r--r-- | src/quickfix.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index 7243a0cbc..758f7921a 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -4230,7 +4230,10 @@ ex_cexpr(eap) if ((tv->v_type == VAR_STRING && tv->vval.v_string != NULL) || (tv->v_type == VAR_LIST && tv->vval.v_list != NULL)) { - if (qf_init_ext(qi, NULL, NULL, tv, p_efm, + 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, (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 badcf25fd..f6f0754c6 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 */ /**/ + 1013, +/**/ 1012, /**/ 1011, |