diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-09-07 22:35:34 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-09-07 22:35:34 +0200 |
| commit | af2d5d2ce26029a47547c05be964e749bb0310d0 (patch) | |
| tree | 02424ca9cb8585589a84108d431e47aa643fac79 | |
| parent | 6853c38b78fe5333f95470e1ff3ca6741247e600 (diff) | |
| download | vim-git-af2d5d2ce26029a47547c05be964e749bb0310d0.tar.gz | |
patch 8.2.3412: Vim9: importing the wrong filev8.2.3412
Problem: Vim9: importing the wrong file.
Solution: Correct the file name. Delete the file afterwards.
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 8341ef192..2600bbdb4 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1480,16 +1480,17 @@ enddef def Test_import_star_fails() writefile([], 'Xfoo.vim') var lines =<< trim END - import * as foo from '/tmp/foo.vim' + import * as foo from './Xfoo.vim' foo = 'bar' END CheckDefAndScriptFailure2(lines, 'E1094:', 'E1236: Cannot use foo itself') lines =<< trim END vim9script - import * as foo from '/tmp/foo.vim' + import * as foo from './Xfoo.vim' var that = foo END CheckScriptFailure(lines, 'E1029: Expected ''.''') + delete('Xfoo.vim') enddef def Test_import_as() diff --git a/src/version.c b/src/version.c index e5facbaa5..81845b7d2 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3412, +/**/ 3411, /**/ 3410, |