Mercurial > vim
changeset 7418:e7874551bb34 v7.4.1013
commit https://github.com/vim/vim/commit/9b05a0d0f94d8c4c1ddd51e7f31b73f7556bdbdc
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 31 21:19:49 2015 +0100
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 31 Dec 2015 21:30:04 +0100 |
| parents | 7824fc26c578 |
| children | 3908cfa1a9a5 |
| files | runtime/doc/quickfix.txt src/quickfix.c src/version.c |
| diffstat | 3 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/quickfix.txt +++ b/runtime/doc/quickfix.txt @@ -1,4 +1,4 @@ -*quickfix.txt* For Vim version 7.4. Last change: 2015 Sep 08 +*quickfix.txt* For Vim version 7.4. Last change: 2015 Dec 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -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 global value - of 'errorformat' and the result is added to the - quickfix list. + 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. 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.
--- 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