summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-11 23:17:39 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-11 23:17:39 +0100
commitefe06f4dd8713e5a8dc8c537b0fdf89101a87c20 (patch)
tree7876cf80fa8ac4fe8a637383a9eecdcba641c4c3
parent0f8de8dfb2cc7b778457d9c84305453bd1ef3600 (diff)
downloadvim-efe06f4dd8713e5a8dc8c537b0fdf89101a87c20.zip
updated for version 7.4.087
Problem: Compiler warning on 64 bit Windows systems. Solution: Fix type cast. (Mike Williams)
-rw-r--r--src/ops.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index 0aebfa14f..bf6519189 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -2193,7 +2193,8 @@ op_replace(oap, c)
else
{
/* Replacing with \r or \n means splitting the line. */
- after_p = alloc_check((unsigned)oldlen + 1 + n - STRLEN(newp));
+ after_p = alloc_check(
+ (unsigned)(oldlen + 1 + n - STRLEN(newp)));
if (after_p != NULL)
STRMOVE(after_p, oldp);
}
diff --git a/src/version.c b/src/version.c
index f4555c726..9b78b171d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 87,
+/**/
86,
/**/
85,