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.

diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 9858d4eb76e64cef8ead10861461ce8d0a3cfa65..674470e597d7b0ee2ca13492046dd181d602444b 100644 (file)
--- 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.

diff --git a/src/quickfix.c b/src/quickfix.c
index 7243a0cbc4635128caa614a94c59993acda3c498..758f7921a7f9fc3f8fba912a3d3f7452e3fe4e4d 100644 (file)
--- 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 badcf25fd34b0470a6682dbdca29c52a5ae1b602..f6f0754c64919e4f66febd956d7b678c9edf3294 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1013,
 /**/
     1012,
 /**/