summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-08-26 23:01:21 +0200
committerBram Moolenaar <Bram@vim.org>2015-08-26 23:01:21 +0200
commit6ed535dbc0981d328c02e139d6505207cbef4835 (patch)
treecfbc19af1b1e9dd87978b26c3614c1f7bc057ec8
parent8060687905bdadc46abb68ee6d40e5660e352297 (diff)
downloadvim-git-6ed535dbc0981d328c02e139d6505207cbef4835.tar.gz
patch 7.4.839v7.4.839
Problem: Compiler warning on 64-bit system. Solution: Add cast to int. (Mike Williams)
-rw-r--r--src/search.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/search.c b/src/search.c
index db6d04c6a..a78f051c2 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1801,7 +1801,7 @@ find_rawstring_end(linep, startpos, endpos)
for (p = linep + startpos->col + 1; *p && *p != '('; ++p)
;
delim_len = (p - linep) - startpos->col - 1;
- delim_copy = vim_strnsave(linep + startpos->col + 1, delim_len);
+ delim_copy = vim_strnsave(linep + startpos->col + 1, (int)delim_len);
if (delim_copy == NULL)
return FALSE;
for (lnum = startpos->lnum; lnum <= endpos->lnum; ++lnum)
diff --git a/src/version.c b/src/version.c
index df4275952..a69d93dc4 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 */
/**/
+ 839,
+/**/
838,
/**/
837,