summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-06 22:03:39 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-06 22:03:39 +0200
commit4fa06870e5d347c30fe55290dab87e494c8aa06a (patch)
tree5daf9f49ce9b0dab408b0d937385101d701c5692
parentf0ab01f6d868164ed0bb247b6f7b152e6929ef18 (diff)
patch 8.1.1286: running tests leaves XTest_tabpage_cmdheight file behindv8.1.1286
Problem: Running tests leaves XTest_tabpage_cmdheight file behind. Solution: Delete the right file. (closes #4350)
-rw-r--r--src/testdir/test_tabpage.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
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
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1286,
+/**/
1285,
/**/
1284,