Merge remote-tracking branch 'vim/master'

src/term.c

@@ -6174,7 +6174,7 @@ gui_get_color_cmn(char_u *name)
 
     while (!feof(fd))
     {
-	int		len;
+	size_t		len;
 	int		pos;
 
 	(void)fgets(line, LINE_LEN, fd);

src/version.c

@@ -768,6 +768,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1797,
 /**/
     1796,
 /**/