thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2681: Vim9: test fails for redeclaring script variable

Browse Source 
Problem:    Vim9: test fails for redeclaring script variable.
Solution:   It's OK to assign to an existing script variable in legacy.
This commit is contained in:
Bram Moolenaar
2021-03-31 21:47:33 +02:00
parent e535db86e7
commit 12be734faf
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/evalvars.c
View File

@@ -3219,16 +3219,17 @@ set_var_const(
goto failed; goto failed;
} }
if (is_script_local && vim9script
&& (flags & (ASSIGN_NO_DECL | ASSIGN_DECL)) == 0)
{
semsg(_(e_redefining_script_item_str), name);
goto failed;
}
if (var_in_vim9script) if (var_in_vim9script)
{ {
where_T where; where_T where;
if ((flags & (ASSIGN_NO_DECL | ASSIGN_DECL)) == 0)
{
semsg(_(e_redefining_script_item_str), name);
goto failed;
}
// check the type and adjust to bool if needed // check the type and adjust to bool if needed
where.wt_index = var_idx; where.wt_index = var_idx;
where.wt_variable = TRUE; where.wt_variable = TRUE;

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2681,
/**/ /**/
2680, 2680,
/**/ /**/