diff --git a/src/ops.c b/src/ops.c index 14d1ed45dd..ea71edbf3c 100644 --- a/src/ops.c +++ b/src/ops.c @@ -2077,7 +2077,7 @@ do_join( currsize = (int)STRLEN(curr); } - ml_replace_len(curwin->w_cursor.lnum, newp, newp_len, TRUE, FALSE); + ml_replace_len(curwin->w_cursor.lnum, newp, (colnr_T)newp_len, TRUE, FALSE); if (setmark && !cmdmod.lockmarks) { diff --git a/src/version.c b/src/version.c index 3a7450962e..e4641dcf98 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 881, /**/ 880, /**/