diff --git a/src/eval.c b/src/eval.c index 55fda77aa..d49264997 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3008,10 +3008,12 @@ eval5(char_u **arg, typval_T *rettv, evalarg_T *evalarg) n1 = tv_get_number_chk(rettv, &error); if (error) { - // This can only happen for "list + non-list". For - // "non-list + ..." or "something - ...", we returned - // before evaluating the 2nd operand. + // This can only happen for "list + non-list" or + // "blob + non-blob". For "non-list + ..." or + // "something - ...", we returned before evaluating the + // 2nd operand. clear_tv(rettv); + clear_tv(&var2); return FAIL; } #ifdef FEAT_FLOAT diff --git a/src/version.c b/src/version.c index c9632c361..986ad77ea 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2712, /**/ 2711, /**/