summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-09-01 16:25:34 +0200
committerBram Moolenaar <Bram@vim.org>2015-09-01 16:25:34 +0200
commit5df1ed2de3fa9dcace996b9a0a4c9b3cea79cf1e (patch)
tree16f204dc400619234d2f70352911d124481113eb
parent37a8de17d4dfd3d463960c38a204ce399c8e19d4 (diff)
downloadvim-git-7.4.845.tar.gz
patch 7.4.845v7.4.845
Problem: Compiler warning for possible loss of data. Solution: Add a type cast. (Erich Ritz)
-rw-r--r--src/misc1.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/misc1.c b/src/misc1.c
index ee2da0887..8b5ea647e 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -3985,7 +3985,7 @@ expand_env_esc(srcp, dst, dstlen, esc, one, startstr)
len = dstlen;
vim_strncpy(dst, var, len);
dst += len;
- dstlen -= len;
+ dstlen -= (int)len;
continue;
}
#endif
diff --git a/src/version.c b/src/version.c
index dadec6a1e..7e464a58f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 845,
+/**/
844,
/**/
843,