summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ex_cmds2.c4
-rw-r--r--src/if_python.c2
-rw-r--r--src/syntax.c2
-rw-r--r--src/version.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 0fcb6c7a71..92451b5e12 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 c9ebf13126..4f23ffa8b8 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 355d41ce48..8d976ea405 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 851d98b3c1..80a48f64a2 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,