summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/terminal.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/terminal.c b/src/terminal.c
index 0d035ff96..18da71025 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3773,9 +3773,9 @@ term_load_dump(typval_T *argvars, typval_T *rettv, int do_diff)
if (opt.jo_term_name == NULL)
{
- int len = STRLEN(fname1) + 12;
+ size_t len = STRLEN(fname1) + 12;
- fname_tofree = alloc(len);
+ fname_tofree = alloc((int)len);
if (fname_tofree != NULL)
{
vim_snprintf((char *)fname_tofree, len, "dump diff %s", fname1);
diff --git a/src/version.c b/src/version.c
index 3c57f0a54..e4878d6af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1626,
+/**/
1625,
/**/
1624,