summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ex_getln.c2
-rw-r--r--src/message.c2
-rw-r--r--src/term.c2
-rw-r--r--src/version.c2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/ex_getln.c b/src/ex_getln.c
index b63ebb6137..70acb0ee65 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -5923,7 +5923,7 @@ ex_history(eap)
hist[i].hisnum);
if (vim_strsize(hist[i].hisstr) > (int)Columns - 10)
trunc_string(hist[i].hisstr, IObuff + STRLEN(IObuff),
- (int)Columns - 10, IOSIZE - STRLEN(IObuff));
+ (int)Columns - 10, IOSIZE - (int)STRLEN(IObuff));
else
STRCAT(IObuff, hist[i].hisstr);
msg_outtrans(IObuff);
diff --git a/src/message.c b/src/message.c
index 872fadc661..c9b6a28463 100644
--- a/src/message.c
+++ b/src/message.c
@@ -325,7 +325,7 @@ trunc_string(s, buf, room, buflen)
if (e + 3 < buflen)
{
mch_memmove(buf + e, "...", (size_t)3);
- len = STRLEN(s + i) + 1;
+ len = (int)STRLEN(s + i) + 1;
if (len >= buflen - e - 3)
len = buflen - e - 3 - 1;
mch_memmove(buf + e + 3, s + i, len);
diff --git a/src/term.c b/src/term.c
index 93d325e43e..47df299615 100644
--- a/src/term.c
+++ b/src/term.c
@@ -5252,7 +5252,7 @@ find_term_bykeys(src)
char_u *src;
{
int i;
- int slen = STRLEN(src);
+ int slen = (int)STRLEN(src);
for (i = 0; i < tc_len; ++i)
{
diff --git a/src/version.c b/src/version.c
index d51cd71b0c..36c3a84802 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 413,
+/**/
412,
/**/
411,