diff options
| -rw-r--r-- | src/quickfix.c | 8 | ||||
| -rw-r--r-- | src/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/testdir/test106.in | 16 | ||||
| -rw-r--r-- | src/testdir/test106.ok | 4 | ||||
| -rw-r--r-- | src/version.c | 4 |
5 files changed, 30 insertions, 4 deletions
diff --git a/src/quickfix.c b/src/quickfix.c index a480fe03ae..3dba30389d 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -713,9 +713,11 @@ restofline: if (fmt_ptr->conthere) fmt_start = fmt_ptr; - if (vim_strchr((char_u *)"AEWI", idx) != NULL) - multiline = TRUE; /* start of a multi-line message */ - else if (vim_strchr((char_u *)"CZ", idx) != NULL) { /* continuation of multi-line msg */ + 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) goto error2; if (*errmsg && !multiignore) { diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 5402935b1f..e2e6850ec9 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -26,7 +26,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 + test104.out test106.out SCRIPTS_GUI := test16.out diff --git a/src/testdir/test106.in b/src/testdir/test106.in new file mode 100644 index 0000000000..eb99e650ae --- /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 index 0000000000..0a18cecf1c --- /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 3016b224cf..9de20667dd 100644 --- a/src/version.c +++ b/src/version.c @@ -202,6 +202,10 @@ static char *(features[]) = { static int included_patches[] = { // Add new patch number below this line + 203, + //202, + //201, + //200, 199, //198, //197, |