diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-03-02 17:54:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-03-02 17:54:33 +0100 |
| commit | 8b9c05fa5416bd35597a4fbe83f811d4f6d068d7 (patch) | |
| tree | d138bbea8d22cd053781bc9eadb3885c9f958ce9 | |
| parent | 8006d69d3c05ef92f5915984baae79ef832380e5 (diff) | |
| download | vim-git-8b9c05fa5416bd35597a4fbe83f811d4f6d068d7.tar.gz | |
updated for version 7.2.383v7.2.383
Problem: Vim doesn't build cleanly with MSVC 2010.
Solution: Change a few types. (George Reilly)
| -rw-r--r-- | src/ex_cmds2.c | 4 | ||||
| -rw-r--r-- | src/if_python.c | 2 | ||||
| -rw-r--r-- | src/syntax.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 0fcb6c7a7..92451b5e1 100644 --- 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 c9ebf1312..4f23ffa8b 100644 --- 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 355d41ce4..8d976ea40 100644 --- 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 851d98b3c..80a48f64a 100644 --- 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, |