diff --git a/src/eval.c b/src/eval.c index 79944c8ca5..0402b36385 100644 --- a/src/eval.c +++ b/src/eval.c @@ -1904,6 +1904,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg) typval_T var2; evalarg_T nested_evalarg; int orig_flags; + int evaluate; if (evalarg == NULL) { @@ -1916,8 +1917,7 @@ eval1(char_u **arg, typval_T *rettv, evalarg_T *evalarg) orig_flags = evalarg->eval_flags; } - int evaluate = nested_evalarg.eval_flags & EVAL_EVALUATE; - + evaluate = nested_evalarg.eval_flags & EVAL_EVALUATE; result = FALSE; if (evaluate) { diff --git a/src/version.c b/src/version.c index 36da620019..b85dc2936d 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1052, /**/ 1051, /**/