diff --git a/src/search.c b/src/search.c
index db6d04c6a7..a78f051c26 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 df4275952c..a69d93dc46 100644
--- 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,
 /**/