Merge remote-tracking branch 'vim/master'

splhack · splhack · commit 1426e4f7dca9 · 2018-07-09T23:42:30.000-07:00
diff --git a/src/libvterm/src/state.c b/src/libvterm/src/state.c
@@ -268,7 +268,7 @@ static int on_text(const char bytes[], size_t len, void *user)
   if(!npoints)
   {
     vterm_allocator_free(state->vt, codepoints);
-    return eaten;
+    return (int)eaten;
   }
 
   if(state->gsingle_set && npoints)
diff --git a/src/version.c b/src/version.c
@@ -804,6 +804,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    173,
 /**/
     172,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ static int on_text(const char bytes[], size_t len, void *user)`
`268`	`268`	`if(!npoints)`
`269`	`269`	`{`
`270`	`270`	`vterm_allocator_free(state->vt, codepoints);`
`271`		`- return eaten;`
	`271`	`+ return (int)eaten;`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`if(state->gsingle_set && npoints)`