Skip to content

Commit b885a7c

Browse files
committed
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.
1 parent c967d57 commit b885a7c

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/testdir/test_vim9_script.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1955,8 +1955,8 @@ def Test_import_rtp()
19551955
'g:imported_rtp = exported',
19561956
]
19571957
writefile(import_lines, 'Ximport_rtp.vim')
1958-
mkdir('Ximport')
1959-
writefile(s:export_script_lines, 'Ximport/Xexport_rtp.vim')
1958+
mkdir('import', 'p')
1959+
writefile(s:export_script_lines, 'import/Xexport_rtp.vim')
19601960

19611961
var save_rtp = &rtp
19621962
&rtp = getcwd()
@@ -1968,7 +1968,7 @@ def Test_import_rtp()
19681968
Undo_export_script_lines()
19691969
unlet g:imported_rtp
19701970
delete('Ximport_rtp.vim')
1971-
delete('Ximport', 'rf')
1971+
delete('import', 'rf')
19721972
enddef
19731973

19741974
def Test_import_compile_error()

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ static char *(features[]) =
755755

756756
static int included_patches[] =
757757
{ /* Add new patch number below this line */
758+
/**/
759+
3130,
758760
/**/
759761
3129,
760762
/**/

0 commit comments

Comments
 (0)