summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/terminal.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 785994138..9a62edd67 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 08b672892..4fc5de022 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1687,
+/**/
1686,
/**/
1685,