patch 9.1.1290: tests: missing cleanup in test_filetype.vim

Problem:  tests: missing cleanup in test_filetype.vim, wrong name in
          test_plugin_matchparen
Solution: Add :bwipe corresponding to :split, rename test case

closes: #17088

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index e2286abd38d17e4b40e8c630c3ee10a1e93c1b20..b3e60e29f39e07efbfb5f1d837891bff606e7c57 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -2814,6 +2814,7 @@ func Test_pro_file()
   call writefile(['x = findgen(100)/10'], 'Xfile.pro', 'D')
   split Xfile.pro
   call assert_equal('idlang', &filetype)
+  bwipe!
 
   filetype off
 endfunc
@@ -2847,6 +2848,7 @@ func Test_pl_file()
   call writefile(['%data = (1, 2, 3);'], 'Xfile.pl', 'D')
   split Xfile.pl
   call assert_equal('perl', &filetype)
+  bwipe!
 
   filetype off
 endfunc
@@ -2892,6 +2894,7 @@ func Test_org_file()
   call writefile(['* org Headline', '*some bold text*', '/some italic text/'], 'Xfile.org', 'D')
   split Xfile.org
   call assert_equal('org', &filetype)
+  bwipe!
 
   filetype off
 endfunc

diff --git a/src/testdir/test_plugin_matchparen.vim b/src/testdir/test_plugin_matchparen.vim
index dca6e3258b18e0ec7e38a14b88a0e2fe59e8b164..74563a19a781cc2ba02e0e455791ab15525cbb1a 100644 (file)
--- a/src/testdir/test_plugin_matchparen.vim
+++ b/src/testdir/test_plugin_matchparen.vim
@@ -178,7 +178,7 @@ func Test_matchparen_ignore_sh_case()
 endfunc
 
 " Test for the WinScrolled event
-func Test_scroll_winenter()
+func Test_scroll_winscrolled()
   CheckScreendump
 
   let lines =<< trim END

diff --git a/src/version.c b/src/version.c
index 9cfbe0b2a399bdfa5c33acc801ccfa1cac40d973..4609244f5d61b5ffe4f0664fad2409be9653466d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1290,
 /**/
     1289,
 /**/