From c0913d023b8bb728e9832727fe1657dbddf685d0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 5 Dec 2020 14:44:37 +0100 Subject: [PATCH] patch 8.2.2093: Vim9: script test sometimes fails Problem: Vim9: script test sometimes fails. Solution: Do not find a script variable by its typval if the name was cleared. --- src/version.c | 2 ++ src/vim9script.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/version.c b/src/version.c index 6f242ff85..b28638b44 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 */ +/**/ + 2093, /**/ 2092, /**/ diff --git a/src/vim9script.c b/src/vim9script.c index 378035660..fa455ab19 100644 --- a/src/vim9script.c +++ b/src/vim9script.c @@ -741,7 +741,9 @@ find_typval_in_script(typval_T *dest) { svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data) + idx; - if (sv->sv_tv == dest) + // If "sv_name" is NULL the variable was hidden when leaving a block, + // don't check "sv_tv" then, it might be used for another variable now. + if (sv->sv_name != NULL && sv->sv_tv == dest) return sv; } iemsg("check_script_var_type(): not found"); -- 2.50.1