updated for version 7.4.203

Problem:    Parsing 'errorformat' is not correct.
Solution:   Reset "multiignore" at the start of a multi-line message. (Lcd)

diff --git a/src/quickfix.c b/src/quickfix.c
index ebb02827db2da5755937043ef43096937e1c17f7..4451d89cd734e8b49a27537caaa0e8d9adcd87d8 100644 (file)
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -751,7 +751,10 @@ restofline:
                fmt_start = fmt_ptr;
 
            if (vim_strchr((char_u *)"AEWI", idx) != NULL)
+           {
                multiline = TRUE;       /* start of a multi-line message */
+               multiignore = FALSE;    /* reset continuation */
+           }
            else if (vim_strchr((char_u *)"CZ", idx) != NULL)
            {                           /* continuation of multi-line msg */
                if (qfprev == NULL)

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index d7f503f276fd8b58a0026c41cd7c38de2cb9bb69..40c62ecf40273320dd2e261f45d0ebffa32f2dd4 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -35,7 +35,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test89.out test90.out test91.out test92.out test93.out \
                test94.out test95.out test96.out test97.out test98.out \
                test99.out test100.out test101.out test102.out test103.out \
-               test104.out test105.out
+               test104.out test105.out test106.out
 
 .SUFFIXES: .in .out
 
@@ -157,3 +157,4 @@ test102.out: test102.in
 test103.out: test103.in
 test104.out: test104.in
 test105.out: test105.in
+test106.out: test106.in

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index d26fe89638dd82a8d258202eb792d4b9836bfd87..45b74b44b0bce4ec98ac014251dad44f7af4efd5 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -34,7 +34,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test89.out test90.out test91.out test92.out test93.out \
                test94.out test95.out test96.out test98.out test99.out \
                test100.out test101.out test102.out test103.out test104.out \
-               test105.out
+               test105.out test106.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 0523ae48d4d12f67878e6e3188ddeefb522e45b3..9f0e0ab063cd0d2b9408450b093c9a839fd4439b 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -54,7 +54,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test89.out test90.out test91.out test92.out test93.out \
                test94.out test95.out test96.out test98.out test99.out \
                test100.out test101.out test102.out test103.out test104.out \
-               test105.out
+               test105.out test106.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 65c0946648c69bb3bd497bef5125b9e49fccfbf8..116c302b40cb40a833cb2cf01f7825cf76aa3fdf 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -36,7 +36,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test89.out test90.out test91.out test92.out test93.out \
                test94.out test95.out test96.out test98.out test99.out \
                test100.out test101.out test102.out test103.out test104.out \
-               test105.out
+               test105.out test106.out
 
 .SUFFIXES: .in .out
 

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index a20fa1fbc323c15e21fb16aa771805417a0c5265..b210d504aafbcf4036827d039eb22229d1b84f5f 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -95,7 +95,7 @@ SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
         test90.out test91.out test92.out test93.out test94.out \
         test95.out test96.out test98.out test99.out \
         test100.out test101.out test103.out test104.out \
-        test105.out
+        test105.out test106.out
 
 # Known problems:
 # test17: ?

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 290200f9a64bee93fcd53b8ca6056f7e32312c82..c9e8922237b087037cb49681cc8158034e01b06b 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -31,7 +31,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
                test89.out test90.out test91.out test92.out test93.out \
                test94.out test95.out test96.out test97.out test98.out \
                test99.out test100.out test101.out test102.out test103.out \
-               test104.out test105.out
+               test104.out test105.out test106.out
 
 SCRIPTS_GUI = test16.out
 

diff --git a/src/testdir/test106.in b/src/testdir/test106.in
new file mode 100644 (file)
index 0000000..eb99e65
--- /dev/null
+++ b/src/testdir/test106.in
@@ -0,0 +1,16 @@
+Tests for errorformat.  vim: set ft=vim ts=8 :
+
+STARTTEST
+:so small.vim
+:if !has('quickfix') | e! test.ok | wq! test.out | endif
+:set efm=%EEEE%m,%WWWW%m,%+CCCC%.%#,%-GGGG%.%#
+:cgetexpr ['WWWW', 'EEEE', 'CCCC']
+:$put =strtrans(string(map(getqflist(), '[v:val.text, v:val.valid]')))
+:cgetexpr ['WWWW', 'GGGG', 'EEEE', 'CCCC']
+:$put =strtrans(string(map(getqflist(), '[v:val.text, v:val.valid]')))
+:cgetexpr ['WWWW', 'GGGG', 'ZZZZ', 'EEEE', 'CCCC', 'YYYY']
+:$put =strtrans(string(map(getqflist(), '[v:val.text, v:val.valid]')))
+:/^Results/,$wq! test.out
+ENDTEST
+
+Results of test106:

diff --git a/src/testdir/test106.ok b/src/testdir/test106.ok
new file mode 100644 (file)
index 0000000..0a18cec
--- /dev/null
+++ b/src/testdir/test106.ok
@@ -0,0 +1,4 @@
+Results of test106:
+[['W', 1], ['E^@CCCC', 1]]
+[['W', 1], ['E^@CCCC', 1]]
+[['W', 1], ['ZZZZ', 0], ['E^@CCCC', 1], ['YYYY', 0]]

diff --git a/src/version.c b/src/version.c
index 2b81f497078839d46e281877b31efbd68c4555e4..112e168e04240bc807f624c6cde1dbf9c806cf3a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    203,
 /**/
     202,
 /**/