diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-15 01:37:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-15 01:37:36 +0200 |
| commit | b6e4e4c6f7b4f7eadcc4c2397bfa57e0734e005f (patch) | |
| tree | 5f715d3243f15982d31a738d254968fc679d3540 | |
| parent | e3f915d12c8fe0466918a29ab4eaef153f71a2cd (diff) | |
| download | vim-git-8.2.1216.tar.gz | |
patch 8.2.1216: startup test failsv8.2.1216
Problem: Startup test fails.
Solution: Adjust expected values for deleted lines.
| -rw-r--r-- | src/testdir/test_startup.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim index 00696284e..8c889fdb1 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 ce0a53e97..7b310e965 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1216, +/**/ 1215, /**/ 1214, |