0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.4.203

Problem:    Parsing 'errorformat' is not correct.
Solution:   Reset "multiignore" at the start of a multi-line message. (Lcd)
This commit is contained in:
Bram Moolenaar
2014-03-12 19:41:55 +01:00
parent b1692e2b8f
commit 8eded09bf7
10 changed files with 32 additions and 6 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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: ?

View File

@@ -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

16
src/testdir/test106.in Normal file
View File

@@ -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:

4
src/testdir/test106.ok Normal file
View File

@@ -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]]

View File

@@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
203,
/**/
202,
/**/