diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 9f1db65b5a..62b39a2d89 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2574,9 +2574,9 @@ barline_parse(vir_T *virp, char_u *text, bval_T *values)
 
 	    if (vim_isdigit(p[1]))
 	    {
-		int len;
-		int todo;
-		int n;
+		size_t len;
+		size_t todo;
+		size_t n;
 
 		/* String value was split into lines that are each shorter
 		 * than LSIZE:
@@ -2586,7 +2586,7 @@ barline_parse(vir_T *virp, char_u *text, bval_T *values)
 		 */
 		++p;
 		len = getdigits(&p);
-		buf = alloc(len + 1);
+		buf = alloc((int)(len + 1));
 		p = buf;
 		for (todo = len; todo > 0; todo -= n)
 		{
diff --git a/src/version.c b/src/version.c
index 547f30add6..571b54e655 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1907,
 /**/
     1906,
 /**/