summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-02 20:03:25 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-02 20:03:25 +0200
commit434d72cbf2170d54cb4f8acbe995a9a55cceb92a (patch)
tree161d3be24d489926aac2d0c03f29eeb9dc0224c1 /src
parent658217276fccb5e53cdf4ba0f023bca80e0a8fed (diff)
downloadvim-git-434d72cbf2170d54cb4f8acbe995a9a55cceb92a.tar.gz
patch 8.2.1358: Vim9: test fails with +dnd is not availablev8.2.1358
Problem: Vim9: test fails with +dnd is not available. Solution: Add condition.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_vim9_script.vim7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 5c2db2ef4..f359a9d91 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -470,7 +470,12 @@ def Test_assignment_failure()
call CheckDefFailure(['let $VAR = 5'], 'E1016: Cannot declare an environment variable:')
call CheckScriptFailure(['vim9script', 'let $ENV = "xxx"'], 'E1016:')
- call CheckDefFailure(['let @~ = 5'], 'E1066:')
+ if has('dnd')
+ call CheckDefFailure(['let @~ = 5'], 'E1066:')
+ else
+ call CheckDefFailure(['let @~ = 5'], 'E354:')
+ call CheckDefFailure(['@~ = 5'], 'E354:')
+ endif
call CheckDefFailure(['let @a = 5'], 'E1066:')
call CheckDefFailure(['let @/ = "x"'], 'E1066:')
call CheckScriptFailure(['vim9script', 'let @a = "abc"'], 'E1066:')
diff --git a/src/version.c b/src/version.c
index a9059792d..4f1d8a179 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 */
/**/
+ 1358,
+/**/
1357,
/**/
1356,