patch 7.4.1149

Problem:    Using the local value of 'errorformat' causes more problems than
            it solves.
Solution:   Revert 7.4.1013.

diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 674470e597d7b0ee2ca13492046dd181d602444b..5436a809a56a607fb400434f8a1fff16a02ac650 100644 (file)
--- 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 21ac1c034639305a7b81256603ca6e9c3ac9d1de..014b93df3452b5cd00b7ce8f9f75e576d45a72a7 100644 (file)
--- 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 792f8a7462203e818c2c236aabca898b775c467d..96e0105fb54d6de213e95190a0398198b8c66666 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 */
+/**/
+    1149,
 /**/
     1148,
 /**/