# HG changeset patch # User Bram Moolenaar # Date 1641566703 -3600 # Node ID 83dcff9f3a9aa8c8d64d1f19bfec68b5c41ced60 # Parent b36d27260f1df4ebc434912772495eb895682414 patch 8.2.4027: import test fails on MS-Windows Commit: https://github.com/vim/vim/commit/2b04d5f1ef0dfaac1706e413947a7297285fa7b9 Author: Bram Moolenaar Date: Fri Jan 7 14:39:56 2022 +0000 patch 8.2.4027: import test fails on MS-Windows Problem: Import test fails on MS-Windows. Solution: Use a different directory name. diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -1573,33 +1573,33 @@ def Test_import_fails() END CheckDefAndScriptFailure(lines, ['E1094:', 'E1236: Cannot use That itself']) - mkdir('Xdir') - - writefile(['vim9script'], 'Xdir/.vim') + mkdir('Ximport') + + writefile(['vim9script'], 'Ximport/.vim') lines =<< trim END vim9script - import './Xdir/.vim' + import './Ximport/.vim' END CheckScriptFailure(lines, 'E1261: Cannot import .vim without using "as"') lines =<< trim END vim9script - import './Xdir/.vim' as vim + import './Ximport/.vim' as vim END CheckScriptSuccess(lines) - writefile(['vim9script'], 'Xdir/.vimrc') + writefile(['vim9script'], 'Ximport/.vimrc') lines =<< trim END vim9script - import './Xdir/.vimrc' + import './Ximport/.vimrc' END CheckScriptFailure(lines, 'E1257: Imported script must use "as" or end in .vim') lines =<< trim END vim9script - import './Xdir/.vimrc' as vimrc + import './Ximport/.vimrc' as vimrc END CheckScriptSuccess(lines) - delete('Xdir', 'rf') + delete('Ximport', 'rf') enddef func g:Trigger() diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4027, +/**/ 4026, /**/ 4025,