diff --git a/src/misc1.c b/src/misc1.c
index ee2da0887b..8b5ea647e8 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 dadec6a1ea..7e464a58f4 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 */
+/**/
+    845,
 /**/
     844,
 /**/