patch 8.2.3559: loop variable recreated every time

Problem:    Loop variable recreated every time.
Solution:   Keep the loop variable when looping.

diff --git a/src/ex_eval.c b/src/ex_eval.c
index 1142280bae3b22f17b94667586ce0d88c365e9f9..1f66e336f66a0f7fca0ed6d9e1651bac168db7de 100644 (file)
--- 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 53ceef0bf6f424c02d19dcbea57c20ad5d5a807d..4381877f3526c0c670e1997a4924238d16e9c75b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3559,
 /**/
     3558,
 /**/