changeset 2100:7d121c69f540 v7.2.383

updated for version 7.2.383 Problem: Vim doesn't build cleanly with MSVC 2010. Solution: Change a few types. (George Reilly)
author Bram Moolenaar <bram@zimbu.org>
date Tue, 02 Mar 2010 17:54:33 +0100
parents c1f67ce5740a
children 8ae4de2d02af
files src/ex_cmds2.c src/if_python.c src/syntax.c src/version.c
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1165,7 +1165,6 @@ set_context_in_profile_cmd(xp, arg)
     char_u	*arg;
 {
     char_u	*end_subcmd;
-    int		len;
 
     /* Default: expand subcommands. */
     xp->xp_context = EXPAND_PROFILE;
@@ -1176,8 +1175,7 @@ set_context_in_profile_cmd(xp, arg)
     if (*end_subcmd == NUL)
 	return;
 
-    len = end_subcmd - arg;
-    if (len == 5 && STRNCMP(arg, "start", 5) == 0)
+    if (end_subcmd - arg == 5 && STRNCMP(arg, "start", 5) == 0)
     {
 	xp->xp_context = EXPAND_FILES;
 	xp->xp_pattern = skipwhite(end_subcmd);
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -2080,7 +2080,7 @@ WindowSetattr(PyObject *self, char *name
 	    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;
 
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3090,7 +3090,7 @@ syn_add_start_off(result, regmatch, spp,
     {
 	/* 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)
     {
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    383,
+/**/
     382,
 /**/
     381,