# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1608302705 -3600
# Node ID 98548b8fbc983e21eda5beeb1630d07622d84ad6
# Parent  02583af089135386e304943ddab3780eb333bf40
patch 8.2.2157: Vim9: can delete a Vim9 script variable from a function

Commit: https://github.com/vim/vim/commit/9aed729fe9e62536236875a42fb170d2c8fb3046
Author: Bram Moolenaar <Bram@vim.org>
Date:   Fri Dec 18 15:38:00 2020 +0100

    patch 8.2.2157: Vim9: can delete a Vim9 script variable from a function

    Problem:    Vim9: can delete a Vim9 script variable from a function.
    Solution:   Check the variable is defined in Vim9 script. (closes https://github.com/vim/vim/issues/7483)

diff --git a/src/evalvars.c b/src/evalvars.c
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -1663,10 +1663,20 @@ do_unlet(char_u *name, int forceit)
     dict_T	*d;
     dictitem_T	*di;
 
+    // can't :unlet a script variable in Vim9 script
     if (in_vim9script() && check_vim9_unlet(name) == FAIL)
 	return FAIL;
 
     ht = find_var_ht(name, &varname);
+
+    // can't :unlet a script variable in Vim9 script from a function
+    if (ht == get_script_local_ht()
+	    && SCRIPT_ID_VALID(current_sctx.sc_sid)
+	    && SCRIPT_ITEM(current_sctx.sc_sid)->sn_version
+							 == SCRIPT_VERSION_VIM9
+	    && check_vim9_unlet(name) == FAIL)
+	return FAIL;
+
     if (ht != NULL && *varname != NUL)
     {
 	d = get_current_funccal_dict(ht);
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -1211,6 +1211,14 @@ def Test_unlet()
   CheckScriptFailure([
    'vim9script',
    'var svar = 123',
+   'func Func()',
+   '  unlet s:svar',
+   'endfunc',
+   'Func()',
+   ], 'E1081:')
+  CheckScriptFailure([
+   'vim9script',
+   'var svar = 123',
    'def Func()',
    '  unlet s:svar',
    'enddef',
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 */
 /**/
+    2157,
+/**/
     2156,
 /**/
     2155,