summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/blob.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/blob.c b/src/blob.c
index 9f5977707..4685dc97c 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -444,7 +444,7 @@ blob_remove(typval_T *argvars, typval_T *rettv)
{
blob_T *blob;
- // Remove range of items, return list with values.
+ // Remove range of items, return blob with values.
end = (long)tv_get_number_chk(&argvars[2], &error);
if (error)
return;
@@ -472,7 +472,8 @@ blob_remove(typval_T *argvars, typval_T *rettv)
rettv->v_type = VAR_BLOB;
rettv->vval.v_blob = blob;
- mch_memmove(p + idx, p + end + 1, (size_t)(len - end));
+ if (len - end - 1 > 0)
+ mch_memmove(p + idx, p + end + 1, (size_t)(len - end - 1));
b->bv_ga.ga_len -= end - idx + 1;
}
}
diff --git a/src/version.c b/src/version.c
index 83d7e5725..12a51c912 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2779,
+/**/
2778,
/**/
2777,