diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-08 22:02:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-08 22:02:11 +0200 |
| commit | b885a7c72c8fed5f14454633fb3ba9d77fff1c24 (patch) | |
| tree | da5176a63a18b6fcb7af5557d1cd936a19cf33cc | |
| parent | c967d57aa9a6bede0f50c6986dcddc1dc035a354 (diff) | |
patch 8.2.3130: Vim9: import test failsv8.2.3130
Problem: Vim9: import test fails.
Solution: Rename directory back to "import", use "p" to avoid an error when
the directory already exists.
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index d4fdd7cf81..66b0c740fe 100644 --- 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 index 6a5997070e..fb76c39c6f 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 */ /**/ + 3130, +/**/ 3129, /**/ 3128, |