summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ex_docmd.c3
-rw-r--r--src/testdir/test_vim9_script.vim13
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c1
-rw-r--r--src/vim9script.c3
5 files changed, 16 insertions, 6 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index ad1693b516..081d9e454c 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7276,6 +7276,9 @@ ex_copymove(exarg_T *eap)
{
long n;
+ if (not_in_vim9(eap) == FAIL)
+ return;
+
n = get_address(eap, &eap->arg, eap->addr_type, FALSE, FALSE, FALSE, 1);
if (eap->arg == NULL) // error detected
{
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index c01b383be5..8950f311a7 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -1628,18 +1628,21 @@ def Test_fixed_size_list()
enddef
def Test_no_insert_xit()
- call CheckDefExecFailure(['x = 1'], 'E1100:')
call CheckDefExecFailure(['a = 1'], 'E1100:')
- call CheckDefExecFailure(['i = 1'], 'E1100:')
call CheckDefExecFailure(['c = 1'], 'E1100:')
+ call CheckDefExecFailure(['i = 1'], 'E1100:')
+ call CheckDefExecFailure(['t = 1'], 'E1100:')
+ call CheckDefExecFailure(['x = 1'], 'E1100:')
- CheckScriptFailure(['vim9script', 'x = 1'], 'E1100:')
CheckScriptFailure(['vim9script', 'a = 1'], 'E488:')
CheckScriptFailure(['vim9script', 'a'], 'E1100:')
- CheckScriptFailure(['vim9script', 'i = 1'], 'E488:')
- CheckScriptFailure(['vim9script', 'i'], 'E1100:')
CheckScriptFailure(['vim9script', 'c = 1'], 'E488:')
CheckScriptFailure(['vim9script', 'c'], 'E1100:')
+ CheckScriptFailure(['vim9script', 'i = 1'], 'E488:')
+ CheckScriptFailure(['vim9script', 'i'], 'E1100:')
+ CheckScriptFailure(['vim9script', 't'], 'E1100:')
+ CheckScriptFailure(['vim9script', 't = 1'], 'E1100:')
+ CheckScriptFailure(['vim9script', 'x = 1'], 'E1100:')
enddef
def IfElse(what: number): string
diff --git a/src/version.c b/src/version.c
index 202ee2ffac..021487db28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1342,
+/**/
1341,
/**/
1340,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 97fa2e0cab..38c097c7f8 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7467,6 +7467,7 @@ compile_def_function(ufunc_T *ufunc, int set_return_type, cctx_T *outer_cctx)
case CMD_append:
case CMD_change:
case CMD_insert:
+ case CMD_t:
case CMD_xit:
not_in_vim9(&ea);
goto erret;
diff --git a/src/vim9script.c b/src/vim9script.c
index 2e94b8e295..e7bb43303e 100644
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -67,9 +67,10 @@ not_in_vim9(exarg_T *eap)
if (in_vim9script())
switch (eap->cmdidx)
{
- case CMD_insert:
case CMD_append:
case CMD_change:
+ case CMD_insert:
+ case CMD_t:
case CMD_xit:
semsg(_("E1100: Missing :let: %s"), eap->cmd);
return FAIL;