kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.203

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

https://code.google.com/p/vim/source/detail?r=fb24b025c7cf07db79a559a3091db42e02c1af86
This commit is contained in:
oni-link 2014-04-12 22:01:37 +02:00 committed by Thiago de Arruda
parent 2e393110ad
commit a1dd6a6dd8
5 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/quickfix.c
View File

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

2
src/testdir/Makefile
View File

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

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

4
src/version.c
View File

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