summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-30 16:40:39 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-30 16:40:39 +0200
commita5c0cc11330157c721748e317e8ff54b649610ca (patch)
treef5bee8724c19f93d4fabee012b7bdacd4797a982
parent623cf88f9c5ad49cce8e846af29a1bb9346c7481 (diff)
patch 7.4.2125v7.4.2125
Problem: Compiler warning for loss of data. Solution: Add a type cast. (Christian Brabandt)
-rw-r--r--src/message.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c
index fe68b5bd00..b4d7b65e67 100644
--- a/src/message.c
+++ b/src/message.c
@@ -304,7 +304,7 @@ trunc_string(
if (len + n > room || half == 0)
break;
len += n;
- i = half;
+ i = (int)half;
}
}
else
diff --git a/src/version.c b/src/version.c
index 9c771022ea..429dda03fa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2125,
+/**/
2124,
/**/
2123,