From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 27 Feb 2015 21:12:34 +0000 (+0100)
Subject: updated for version 7.4.648
X-Git-Tag: v7.4.648
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=bac203ea2d0e3b2a5e4eae4dbe48244e592926e2;p=thirdparty%2Fvim.git

updated for version 7.4.648
Problem:    Tests broken on MS-Windows.
Solution:   Delete wrong copy line. (Ken Takata)
---

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 55bf77ec6b..4b17f96f4b 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -84,7 +84,6 @@ $(DOSTMP_INFILES): $(*B).in
 $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
 	-@if exist test.out DEL test.out
 	move $(*B).in $(*B).in.bak
-	copy $*.in $(*B).in
 	copy $(DOSTMP)\$(*B).in $(*B).in
 	copy $(*B).ok test.ok
 	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $(*B).in
diff --git a/src/version.c b/src/version.c
index 21215ae3a1..ac5f6770de 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    648,
 /**/
     647,
 /**/