summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ex_eval.c7
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c
index 94338fcdb..ad9de26db 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -920,6 +920,13 @@ enter_block(cstack_T *cstack)
cstack->cs_block_id[cstack->cs_idx] = ++si->sn_last_block_id;
si->sn_current_block_id = si->sn_last_block_id;
}
+ else
+ {
+ // Just in case in_vim9script() does not return the same value when the
+ // block ends.
+ cstack->cs_script_var_len[cstack->cs_idx] = 0;
+ cstack->cs_block_id[cstack->cs_idx] = 0;
+ }
}
static void
diff --git a/src/version.c b/src/version.c
index 17ca2717d..d9d8104af 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 */
/**/
+ 2417,
+/**/
2416,
/**/
2415,