To: vim_dev@googlegroups.com Subject: Patch 8.2.4027 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.4027 Problem: Import test fails on MS-Windows. Solution: Use a different directory name. Files: src/testdir/test_vim9_script.vim *** ../vim-8.2.4026/src/testdir/test_vim9_script.vim 2022-01-07 13:38:20.423442096 +0000 --- src/testdir/test_vim9_script.vim 2022-01-07 14:38:41.238050708 +0000 *************** *** 1573,1605 **** END CheckDefAndScriptFailure(lines, ['E1094:', 'E1236: Cannot use That itself']) ! mkdir('Xdir') ! writefile(['vim9script'], 'Xdir/.vim') lines =<< trim END vim9script ! import './Xdir/.vim' END CheckScriptFailure(lines, 'E1261: Cannot import .vim without using "as"') lines =<< trim END vim9script ! import './Xdir/.vim' as vim END CheckScriptSuccess(lines) ! writefile(['vim9script'], 'Xdir/.vimrc') lines =<< trim END vim9script ! import './Xdir/.vimrc' END CheckScriptFailure(lines, 'E1257: Imported script must use "as" or end in .vim') lines =<< trim END vim9script ! import './Xdir/.vimrc' as vimrc END CheckScriptSuccess(lines) ! delete('Xdir', 'rf') enddef func g:Trigger() --- 1573,1605 ---- END CheckDefAndScriptFailure(lines, ['E1094:', 'E1236: Cannot use That itself']) ! mkdir('Ximport') ! writefile(['vim9script'], 'Ximport/.vim') lines =<< trim END vim9script ! import './Ximport/.vim' END CheckScriptFailure(lines, 'E1261: Cannot import .vim without using "as"') lines =<< trim END vim9script ! import './Ximport/.vim' as vim END CheckScriptSuccess(lines) ! writefile(['vim9script'], 'Ximport/.vimrc') lines =<< trim END vim9script ! import './Ximport/.vimrc' END CheckScriptFailure(lines, 'E1257: Imported script must use "as" or end in .vim') lines =<< trim END vim9script ! import './Ximport/.vimrc' as vimrc END CheckScriptSuccess(lines) ! delete('Ximport', 'rf') enddef func g:Trigger() *** ../vim-8.2.4026/src/version.c 2022-01-07 14:07:58.811008543 +0000 --- src/version.c 2022-01-07 14:39:17.681966908 +0000 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 4027, /**/ -- hundred-and-one symptoms of being an internet addict: 244. You use more than 20 passwords. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///