diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-12-05 14:44:37 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-12-05 14:44:37 +0100 |
commit | c0913d023b8bb728e9832727fe1657dbddf685d0 (patch) | |
tree | 0a2e85c7ef9ef606f90145b3642295f6234778c4 | |
parent | 2d870f8d9ebad22d32799d0d0ee30943d0a0e49d (diff) | |
download | vim-git-c0913d023b8bb728e9832727fe1657dbddf685d0.tar.gz |
patch 8.2.2093: Vim9: script test sometimes failsv8.2.2093
Problem: Vim9: script test sometimes fails.
Solution: Do not find a script variable by its typval if the name was
cleared.
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9script.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c index 6f242ff85..b28638b44 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 */ /**/ + 2093, +/**/ 2092, /**/ 2091, 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"); |