From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 2 Mar 2010 16:59:44 +0000 (+0100)
Subject: updated for version 7.2.384
X-Git-Tag: v7.2.384
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2498b3ab108a99f125e756ac46bf2629ceb23c25;p=vim

updated for version 7.2.384
Problem:    Vim doesn't build properly with MSVC 2010.
Solution:   Add the nmake version to the build file. (George Reilly)
---

diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 15a14ade1..38ced6e5c 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -361,6 +361,9 @@ MSVCVER = 9.0
 !if "$(_NMAKE_VER)" == "10.00.20506.01"
 MSVCVER = 10.0
 !endif
+!if "$(_NMAKE_VER)" == "10.00.30128.01"
+MSVCVER = 10.0
+!endif
 !endif
 
 # Abort bulding VIM if version of VC is unrecognised.
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 29f8b8687..8f35c7bd1 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -56,6 +56,7 @@ clean:
 	-if exist small.vim del small.vim
 	-if exist tiny.vim del tiny.vim
 	-if exist mbyte.vim del mbyte.vim
+	-if exist mzscheme.vim del mzscheme.vim
 	-del X*
 	-if exist viminfo del viminfo
 
diff --git a/src/version.c b/src/version.c
index 80a48f64a..f4eaa93e6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    384,
 /**/
     383,
 /**/