| To: vim_dev@googlegroups.com |
| Subject: Patch 7.4.203 |
| Fcc: outbox |
| From: Bram Moolenaar <Bram@moolenaar.net> |
| Mime-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| |
| Patch 7.4.203 |
| Problem: Parsing 'errorformat' is not correct. |
| Solution: Reset "multiignore" at the start of a multi-line message. (Lcd) |
| Files: src/quickfix.c, src/testdir/Make_amiga.mak, |
| src/testdir/Make_dos.mak, src/testdir/Make_ming.mak, |
| src/testdir/Make_os2.mak, src/testdir/Make_vms.mms, |
| src/testdir/Makefile, src/testdir/test106.in, |
| src/testdir/test106.ok |
| |
| |
| |
| |
| |
| *** 751,757 **** |
| --- 751,760 ---- |
| 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) |
| |
| |
| |
| *** 35,41 **** |
| 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 |
| |
| .SUFFIXES: .in .out |
| |
| --- 35,41 ---- |
| 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 test106.out |
| |
| .SUFFIXES: .in .out |
| |
| |
| *** 157,159 **** |
| --- 157,160 ---- |
| test103.out: test103.in |
| test104.out: test104.in |
| test105.out: test105.in |
| + test106.out: test106.in |
| |
| |
| |
| *** 34,40 **** |
| 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 |
| |
| SCRIPTS32 = test50.out test70.out |
| |
| --- 34,40 ---- |
| 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 test106.out |
| |
| SCRIPTS32 = test50.out test70.out |
| |
| |
| |
| |
| *** 54,60 **** |
| 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 |
| |
| SCRIPTS32 = test50.out test70.out |
| |
| --- 54,60 ---- |
| 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 test106.out |
| |
| SCRIPTS32 = test50.out test70.out |
| |
| |
| |
| |
| *** 36,42 **** |
| 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 |
| |
| .SUFFIXES: .in .out |
| |
| --- 36,42 ---- |
| 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 test106.out |
| |
| .SUFFIXES: .in .out |
| |
| |
| |
| |
| *** 95,101 **** |
| 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 |
| |
| # Known problems: |
| # test17: ? |
| --- 95,101 ---- |
| 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 test106.out |
| |
| # Known problems: |
| # test17: ? |
| |
| |
| |
| *** 31,37 **** |
| 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 |
| |
| SCRIPTS_GUI = test16.out |
| |
| --- 31,37 ---- |
| 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 test106.out |
| |
| SCRIPTS_GUI = test16.out |
| |
| |
| |
| |
| |
| --- 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: |
| |
| |
| |
| |
| --- 1,4 ---- |
| + Results of test106: |
| + [['W', 1], ['E^@CCCC', 1]] |
| + [['W', 1], ['E^@CCCC', 1]] |
| + [['W', 1], ['ZZZZ', 0], ['E^@CCCC', 1], ['YYYY', 0]] |
| |
| |
| |
| *** 740,741 **** |
| --- 740,743 ---- |
| { /* Add new patch number below this line */ |
| + /**/ |
| + 203, |
| /**/ |
| |
| -- |
| "I know that there are people who don't love their fellow man, |
| and I hate those people!" - Tom Lehrer |
| |
| /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ |
| /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
| \\\ an exciting new programming language -- http://www.Zimbu.org /// |
| \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |