From af2d5d2ce26029a47547c05be964e749bb0310d0 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 7 Sep 2021 22:35:34 +0200 Subject: [PATCH] patch 8.2.3412: Vim9: importing the wrong file Problem: Vim9: importing the wrong file. Solution: Correct the file name. Delete the file afterwards. --- src/testdir/test_vim9_script.vim | 5 +++-- 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 @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3412, /**/ 3411, /**/ -- 2.50.1