diff --git a/src/terminal.c b/src/terminal.c index 7859941380ae4..9a62edd67ba21 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -3400,7 +3400,7 @@ static VTermParserCallbacks parser_fallbacks = { static void * vterm_malloc(size_t size, void *data UNUSED) { - return alloc_clear(size); + return alloc_clear((unsigned) size); } static void @@ -4016,9 +4016,9 @@ get_separator(int text_width, char_u *fname) int fname_size; char_u *p = fname; int i; - int off; + size_t off; - textline = alloc(width + STRLEN(fname) + 1); + textline = alloc(width + (int)STRLEN(fname) + 1); if (textline == NULL) return NULL; diff --git a/src/version.c b/src/version.c index 08b672892a4fe..4fc5de0225598 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1687, /**/ 1686, /**/