diff --git a/src/alloc.c b/src/alloc.c index 5f39085bce..386964c5b6 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -770,7 +770,10 @@ ga_concat_strings(garray_T *gap, char *sep) char_u *p; for (i = 0; i < gap->ga_len; ++i) - len += (int)STRLEN(((char_u **)(gap->ga_data))[i]) + sep_len; + len += (int)STRLEN(((char_u **)(gap->ga_data))[i]); + + if (gap->ga_len > 1) + len += (gap->ga_len - 1) * sep_len; s = alloc(len + 1); if (s == NULL) diff --git a/src/version.c b/src/version.c index b0ce4f3110..db3a4b7ac3 100644 --- a/src/version.c +++ b/src/version.c @@ -724,6 +724,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1691, /**/ 1690, /**/