Index: src/ex_cmds2.c
===================================================================
--- src/ex_cmds2.c	(revision 1780)
+++ src/ex_cmds2.c	(working copy)
@@ -1165,7 +1165,7 @@
     char_u	*arg;
 {
     char_u	*end_subcmd;
-    int		len;
+    size_t	len;
 
     /* Default: expand subcommands. */
     xp->xp_context = EXPAND_PROFILE;
Index: src/if_python.c
===================================================================
--- src/if_python.c	(revision 1780)
+++ src/if_python.c	(working copy)
@@ -2080,7 +2080,7 @@
 	    return -1;
 
 	/* When column is out of range silently correct it. */
-	len = STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE));
+	len = (long)STRLEN(ml_get_buf(this->win->w_buffer, lnum, FALSE));
 	if (col > len)
 	    col = len;
 
Index: src/Make_mvc.mak
===================================================================
--- src/Make_mvc.mak	(revision 1780)
+++ src/Make_mvc.mak	(working copy)
@@ -361,7 +361,10 @@
 !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.
 !ifndef MSVCVER
Index: src/syntax.c
===================================================================
--- src/syntax.c	(revision 1780)
+++ src/syntax.c	(working copy)
@@ -3090,7 +3090,7 @@
     {
 	/* a "\n" at the end of the pattern may take us below the last line */
 	result->lnum = syn_buf->b_ml.ml_line_count;
-	col = STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE));
+	col = (int)STRLEN(ml_get_buf(syn_buf, result->lnum, FALSE));
     }
     if (off != 0)
     {
Index: src/testdir/Make_dos.mak
===================================================================
--- src/testdir/Make_dos.mak	(revision 1780)
+++ src/testdir/Make_dos.mak	(working copy)
@@ -56,6 +56,7 @@
 	-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