patch 7.4.839

Problem:    Compiler warning on 64-bit system.
Solution:   Add cast to int. (Mike Williams)

diff --git a/src/search.c b/src/search.c
index db6d04c6a7d2a7535f1d3ff3a4427bf03d23549b..a78f051c2628b89c74a16f22a53141b51414dbcc 100644 (file)
--- 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 df4275952c2b2ce730c8760ced3e20328d2275e3..a69d93dc46b77dd394e296edc83e2e733140dc11 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    839,
 /**/
     838,
 /**/