diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim index 6b7ef92478..60a5f3d968 100644 --- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -573,7 +573,7 @@ func Test_tabpage_cmdheight() call VerifyScreenDump(buf, 'Test_tabpage_cmdheight', {}) call StopVimInTerminal(buf) - call delete('XTest_conceal') + call delete('XTest_tabpage_cmdheight') endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index f4344aa387..098c723a6e 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1286, /**/ 1285, /**/