From: Bram Moolenaar Date: Thu, 26 Jan 2012 12:01:59 +0000 (+0100) Subject: updated for version 7.3.413 X-Git-Tag: v7.3.413 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38f5f9529a2657d42fd85d27adc9f778bdf3530e;p=vim updated for version 7.3.413 Problem: Build warnings on MS-Windows. Solution: Add type casts. (Mike Williams) --- diff --git a/src/ex_getln.c b/src/ex_getln.c index b63ebb613..70acb0ee6 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 872fadc66..c9b6a2846 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 93d325e43..47df29961 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 d51cd71b0..36c3a8480 100644 --- a/src/version.c +++ b/src/version.c @@ -714,6 +714,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 413, /**/ 412, /**/