From: Bram Moolenaar Date: Tue, 14 Jul 2020 23:37:36 +0000 (+0200) Subject: patch 8.2.1216: startup test fails X-Git-Tag: v8.2.1216 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6e4e4c6f7b4f7eadcc4c2397bfa57e0734e005f;p=thirdparty%2Fvim.git patch 8.2.1216: startup test fails Problem: Startup test fails. Solution: Adjust expected values for deleted lines. --- diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 00696284e7..8c889fdb1e 100644 --- a/src/testdir/test_startup.vim +++ b/src/testdir/test_startup.vim @@ -299,7 +299,7 @@ func Test_q_arg() if RunVim([], after, '-q') let lines = readfile('Xtestout') call assert_equal(['errors.err', - \ '[0, 208, 5, 0]', + \ '[0, 208, 1, 0]', \ source_file . "|208 col 5| error: expected ';' before '}' token"], \ lines) endif @@ -311,7 +311,7 @@ func Test_q_arg() if RunVim([], after, '-q Xerrors') let lines = readfile('Xtestout') call assert_equal(['Xerrors', - \ '[0, 208, 5, 0]', + \ '[0, 208, 1, 0]', \ source_file . "|208 col 5| error: expected ';' before '}' token"], \ lines) endif @@ -321,7 +321,7 @@ func Test_q_arg() if RunVim([], after, '-qXerrors') let lines = readfile('Xtestout') call assert_equal(['Xerrors', - \ '[0, 208, 5, 0]', + \ '[0, 208, 1, 0]', \ source_file . "|208 col 5| error: expected ';' before '}' token"], \ lines) endif diff --git a/src/version.c b/src/version.c index ce0a53e971..7b310e965f 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1216, /**/ 1215, /**/