summaryrefslogtreecommitdiff
path: root/src/evalvars.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-12-18 15:38:00 +0100
committerBram Moolenaar <Bram@vim.org>2020-12-18 15:38:00 +0100
commit9aed729fe9e62536236875a42fb170d2c8fb3046 (patch)
tree597232f50b0ec43af1c922800748a5d72b18a994 /src/evalvars.c
parentb5b77378bc35cb268c384e98c59f2bf8cb406270 (diff)
downloadvim-git-9aed729fe9e62536236875a42fb170d2c8fb3046.tar.gz
patch 8.2.2157: Vim9: can delete a Vim9 script variable from a functionv8.2.2157
Problem: Vim9: can delete a Vim9 script variable from a function. Solution: Check the variable is defined in Vim9 script. (closes #7483)
Diffstat (limited to 'src/evalvars.c')
-rw-r--r--src/evalvars.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/evalvars.c b/src/evalvars.c
index 9e11578e1..fde80d750 100644
--- 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);