From b6e4e4c6f7b4f7eadcc4c2397bfa57e0734e005f Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 15 Jul 2020 01:37:36 +0200
Subject: [PATCH] patch 8.2.1216: startup test fails
Problem: Startup test fails.
Solution: Adjust expected values for deleted lines.
---
src/testdir/test_startup.vim | 6 +++---
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 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,
/**/
--
GitLab