# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1371498817 -7200
# Node ID d10ede931224a9818a98a58bd9382f77728ced1b
# Parent  6eaa2ff2149bc40162bceffcd6e61a3a6ed7b11d
updated for version 7.3.1218
Problem:    "make test" on MS-Windows does not clean all temporary files and
	    gives some unneccessary message.
Solution:   Clean the right files.  Create .failed files. (Ken Takata)

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -61,6 +61,7 @@ report:
 
 clean:
 	-del *.out
+	-del *.failed
 	-if exist test.ok del test.ok
 	-if exist small.vim del small.vim
 	-if exist tiny.vim del tiny.vim
@@ -68,18 +69,22 @@ clean:
 	-if exist mzscheme.vim del mzscheme.vim
 	-if exist lua.vim del lua.vim
 	-del X*
+	-if exist Xdir1 rd /s /q Xdir1
+	-if exist Xfind rd /s /q Xfind
 	-if exist viminfo del viminfo
 	-del test.log
 
 .in.out:
+	-if exist $*.failed del $*.failed
 	copy $*.ok test.ok
 	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $*.in
-	@diff test.out $*.ok & if errorlevel 1 (echo $* FAILED >> test.log ) \
-		else ( del /F $*.out & rename test.out $*.out )
+	@diff test.out $*.ok & if errorlevel 1 \
+		( move /y test.out $*.failed & echo $* FAILED >> test.log ) \
+		else ( move /y test.out $*.out )
 	-del X*
-	-del X*.*
 	-del test.ok
-	-rd /s /q Xfind
+	-if exist Xdir1 rd /s /q Xdir1
+	-if exist Xfind rd /s /q Xfind
 	-if exist viminfo del viminfo
 
 nolog:
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1218,
+/**/
     1217,
 /**/
     1216,