# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1607175903 -3600
# Node ID 8b93aea8d9d739b51847e3ed08bc531d21c8051d
# Parent  2e6c66937951b56427eb8813ec9468cd2e59217f
patch 8.2.2093: Vim9: script test sometimes fails

Commit: https://github.com/vim/vim/commit/c0913d023b8bb728e9832727fe1657dbddf685d0
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Dec 5 14:44:37 2020 +0100

    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.

diff --git a/src/version.c b/src/version.c
--- 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
--- 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");