diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-07-02 17:36:31 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-07-02 17:36:31 +0100 |
commit | 022f9ef16c955d6b5fca0f53b79899c56a3966c5 (patch) | |
tree | 8528160f0a3d3d24887d3d548951deb07f71a0d9 /src/misc1.c | |
parent | 2d2950198231a31bf87c1cd4322099cc36b0bb93 (diff) |
patch 9.0.0028: MS-Windows: tests fail if there is a "runtime" directoryv9.0.0028
Problem: MS-Windows: tests fail if there is a stray "runtime" directory.
Solution: Only use a "runtime" directory if it contains "defaults.vim".
Diffstat (limited to 'src/misc1.c')
-rw-r--r-- | src/misc1.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/misc1.c b/src/misc1.c index 91e208b352..1ab3159413 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -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; } |