updated for version 7.2.383

Problem:    Vim doesn't build cleanly with MSVC 2010.
Solution:   Change a few types. (George Reilly)

diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 0fcb6c7a71a64ffe3ab7fbc9534f223b7c055cad..92451b5e12288ca4789c9e4f642714de20d70b79 100644 (file)
--- 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);

diff --git a/src/if_python.c b/src/if_python.c
index c9ebf1312604a00bdc4f9e802e554fbdaf266704..4f23ffa8b834ca7915171bea61feb1094a532574 100644 (file)
--- a/src/if_python.c
+++ b/src/if_python.c
@@ -2080,7 +2080,7 @@ WindowSetattr(PyObject *self, char *name, PyObject *val)
            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;
 

diff --git a/src/syntax.c b/src/syntax.c
index 355d41ce48247311e35566c3678f8922193fe6b0..8d976ea4056872080d2c260d88cc5bd59d5cc9cb 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -3090,7 +3090,7 @@ syn_add_start_off(result, regmatch, spp, idx, extra)
     {
        /* 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)
     {

diff --git a/src/version.c b/src/version.c
index 851d98b3c1d0543a286b67dbdc6238ef2e696da6..80a48f64a2c8a3622f174c70cb044d4a0153ec6c 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 */
+/**/
+    383,
 /**/
     382,
 /**/