thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0028: MS-Windows: tests fail if there is a "runtime" directory

Browse Source 
Problem:    MS-Windows: tests fail if there is a stray "runtime" directory.
Solution:   Only use a "runtime" directory if it contains "defaults.vim".
This commit is contained in:
Bram Moolenaar
2022-07-02 17:36:31 +01:00
parent 2d29501982
commit 022f9ef16c
3 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/misc1.c
View File

@@ -1655,7 +1655,21 @@ vim_version_dir(char_u *vimdir)
vim_free(p);
p = concat_fnames(vimdir, (char_u *)RUNTIME_DIRNAME, TRUE);
if (p != NULL && mch_isdir(p))
return p;
{
char_u *fname = concat_fnames(p, (char_u *)"defaults.vim", TRUE);
// Check that "defaults.vim" exists in this directory, to avoid picking
// up a stray "runtime" directory, it would make many tests fail in
// mysterious ways.
if (fname != NULL)
{
int exists = file_is_readable(fname);
vim_free(fname);
if (exists)
return p;
}
}
vim_free(p);
return NULL;
}