# HG changeset patch # User Bram Moolenaar # Date 1625775303 -7200 # Node ID 8998dff30044321152e468a0ca2f37f4934080d2 # Parent fda25adc906d43ccc82e11381a443029160f408b patch 8.2.3130: Vim9: import test fails Commit: https://github.com/vim/vim/commit/b885a7c72c8fed5f14454633fb3ba9d77fff1c24 Author: Bram Moolenaar Date: Thu Jul 8 22:02:11 2021 +0200 patch 8.2.3130: Vim9: import test fails Problem: Vim9: import test fails. Solution: Rename directory back to "import", use "p" to avoid an error when the directory already exists. 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 @@ -1955,8 +1955,8 @@ def Test_import_rtp() 'g:imported_rtp = exported', ] writefile(import_lines, 'Ximport_rtp.vim') - mkdir('Ximport') - writefile(s:export_script_lines, 'Ximport/Xexport_rtp.vim') + mkdir('import', 'p') + writefile(s:export_script_lines, 'import/Xexport_rtp.vim') var save_rtp = &rtp &rtp = getcwd() @@ -1968,7 +1968,7 @@ def Test_import_rtp() Undo_export_script_lines() unlet g:imported_rtp delete('Ximport_rtp.vim') - delete('Ximport', 'rf') + delete('import', 'rf') enddef def Test_import_compile_error() diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 3130, +/**/ 3129, /**/ 3128,