patch 8.2.3053: Vim9: cannot assign to @@ in :def function
Problem: Vim9: cannot assign to @@ in :def function
Solution: Handle '@' like '"'.
diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim
index cba7972..55b850a 100644
--- a/src/testdir/test_vim9_assign.vim
+++ b/src/testdir/test_vim9_assign.vim
@@ -228,16 +228,6 @@
CheckDefFailure(['$SOME_ENV_VAR += "more"'], 'E1051:')
CheckDefFailure(['$SOME_ENV_VAR += 123'], 'E1012:')
- lines =<< trim END
- @c = 'areg'
- @c ..= 'add'
- assert_equal('aregadd', @c)
- END
- CheckDefAndScriptSuccess(lines)
-
- CheckDefFailure(['@a += "more"'], 'E1051:')
- CheckDefFailure(['@a += 123'], 'E1012:')
-
v:errmsg = 'none'
v:errmsg ..= 'again'
assert_equal('noneagain', v:errmsg)
@@ -249,6 +239,21 @@
END
enddef
+def Test_assign_register()
+ var lines =<< trim END
+ @c = 'areg'
+ @c ..= 'add'
+ assert_equal('aregadd', @c)
+
+ @@ = 'some text'
+ assert_equal('some text', getreg('"'))
+ END
+ CheckDefAndScriptSuccess(lines)
+
+ CheckDefFailure(['@a += "more"'], 'E1051:')
+ CheckDefFailure(['@a += 123'], 'E1012:')
+enddef
+
def Test_reserved_name()
for name in ['true', 'false', 'null']
CheckDefExecAndScriptFailure(['var ' .. name .. ' = 0'], 'E1034:')
diff --git a/src/version.c b/src/version.c
index 2b32047..429fb69 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3053,
+/**/
3052,
/**/
3051,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index bb5ea97..b8a8794 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -5854,7 +5854,8 @@
}
else if (*name == '@')
{
- if (!valid_yank_reg(name[1], FALSE) || name[1] == '.')
+ if (name[1] != '@'
+ && (!valid_yank_reg(name[1], FALSE) || name[1] == '.'))
{
emsg_invreg(name[1]);
return FAIL;