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 15a14ade1073fe2919e07e002f1b09d6210514bd..38ced6e5cfbf8c91ce2ecfa2ad0ee37703a25bd8 100644 (file)
--- 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 29f8b86875e36d146dfb2a90a9732410af6438bb..8f35c7bd1353004936453cc0f60df77434db1599 100644 (file)
--- 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 80a48f64a2c8a3622f174c70cb044d4a0153ec6c..f4eaa93e6aa1656f8ab581101929c0f58b1e404d 100644 (file)
--- 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,
 /**/