From 7e765a39b795d5331bf2d4927b41df7b78915af9 Mon Sep 17 00:00:00 2001
From: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Mon, 24 Jan 2022 11:40:37 +0000
Subject: [PATCH] patch 8.2.4200: some tests do not clean up properly

Problem:    Some tests do not clean up properly.
Solution:   Delete created files. (Yegappan Lakshmanan, closes #9611)
---
 src/testdir/test_filetype.vim    | 4 ++++
 src/testdir/test_messages.vim    | 1 +
 src/testdir/test_vim9_import.vim | 5 +++--
 src/version.c                    | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 99be4702c..2490377ea 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -1191,6 +1191,10 @@ func Test_foam_file()
 
   call delete('0', 'rf')
   call delete('0.orig', 'rf')
+  call delete('Xfile1Dict')
+  call delete('Xfile1Dict.something')
+  call delete('XfileProperties')
+  call delete('XfileProperties.something')
   filetype off
 endfunc
 
diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 1ba92ff5f..d3c80bf6c 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -373,6 +373,7 @@ func Test_fileinfo_after_echo()
   " clean up
   call StopVimInTerminal(buf)
   call delete('Xtest_fileinfo_after_echo')
+  call delete('b.txt')
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_vim9_import.vim b/src/testdir/test_vim9_import.vim
index 8291e4a48..2ad505756 100644
--- a/src/testdir/test_vim9_import.vim
+++ b/src/testdir/test_vim9_import.vim
@@ -757,6 +757,7 @@ def Run_Test_import_in_diffexpr()
   diffoff!
   bwipe!
   bwipe!
+  delete('Xdiffexpr')
 enddef
 
 def Test_import_in_patchexpr()
@@ -843,7 +844,7 @@ def Test_import_in_includeexpr()
   bwipe!
   bwipe!
   set includeexpr=
-  delete('Xinclude')
+  delete('Xinclude.vim')
   delete('Xthisfile')
 enddef
 
@@ -1927,7 +1928,7 @@ def Test_autoload_name_wring()
   writefile(lines, 'Xscriptname.vim')
   CheckScriptFailure(lines, 'E1263:')
 
-  delete('Xscriptname')
+  delete('Xscriptname.vim')
 enddef
 
 def Test_import_autoload_postponed()
diff --git a/src/version.c b/src/version.c
index 621bc59a2..aa0910e0f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4200,
 /**/
     4199,
 /**/
-- 
2.50.1