summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-28 21:15:07 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-28 21:15:07 +0200
commit68e30449a2954557d6542fdc2ccea32d4f8ddf9d (patch)
treeb033f955013b6442cc2e15974e714934a4d743ea
parentbd7f7c123db58dd7f50f4d1391577686d2f1bcc6 (diff)
downloadvim-git-68e30449a2954557d6542fdc2ccea32d4f8ddf9d.tar.gz
patch 8.2.1311: test failures with legacy Vim scriptv8.2.1311
Problem: Test failures with legacy Vim script. Solution: Actually check for Vim9 script.
-rw-r--r--src/version.c2
-rw-r--r--src/vim9script.c21
2 files changed, 13 insertions, 10 deletions
diff --git a/src/version.c b/src/version.c
index d8dfba87b..93da0a8ab 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 */
/**/
+ 1311,
+/**/
1310,
/**/
1309,
diff --git a/src/vim9script.c b/src/vim9script.c
index 7d783ea93..2e94b8e29 100644
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -64,16 +64,17 @@ ex_vim9script(exarg_T *eap)
int
not_in_vim9(exarg_T *eap)
{
- switch (eap->cmdidx)
- {
- case CMD_insert:
- case CMD_append:
- case CMD_change:
- case CMD_xit:
- semsg(_("E1100: Missing :let: %s"), eap->cmd);
- return FAIL;
- default: break;
- }
+ if (in_vim9script())
+ switch (eap->cmdidx)
+ {
+ case CMD_insert:
+ case CMD_append:
+ case CMD_change:
+ case CMD_xit:
+ semsg(_("E1100: Missing :let: %s"), eap->cmd);
+ return FAIL;
+ default: break;
+ }
return OK;
}