diff options
-rw-r--r-- | src/ex_eval.c | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index 1142280bae..1f66e336f6 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -1191,8 +1191,9 @@ ex_while(exarg_T *eap) & CSF_FUNC_DEF; // Any variables defined in the previous round are no longer - // visible. - for (i = cstack->cs_script_var_len[cstack->cs_idx]; + // visible. Keep the first one, it is the loop variable that + // we reuse every time around. + for (i = cstack->cs_script_var_len[cstack->cs_idx] + 1; i < si->sn_var_vals.ga_len; ++i) { svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data) + i; diff --git a/src/version.c b/src/version.c index 53ceef0bf6..4381877f35 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3559, +/**/ 3558, /**/ 3557, |