patch 9.0.0028: MS-Windows: tests fail if there is a "runtime" directory
Problem: MS-Windows: tests fail if there is a stray "runtime" directory.
Solution: Only use a "runtime" directory if it contains "defaults.vim".
diff --git a/src/filepath.c b/src/filepath.c
index 854d823..f1ae18e 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -774,6 +774,26 @@
shorten_dir_len(str, 1);
}
+/*
+ * Return TRUE if "fname" is a readable file.
+ */
+ int
+file_is_readable(char_u *fname)
+{
+ int fd;
+
+#ifndef O_NONBLOCK
+# define O_NONBLOCK 0
+#endif
+ if (*fname && !mch_isdir(fname)
+ && (fd = mch_open((char *)fname, O_RDONLY | O_NONBLOCK, 0)) >= 0)
+ {
+ close(fd);
+ return TRUE;
+ }
+ return FALSE;
+}
+
#if defined(FEAT_EVAL) || defined(PROTO)
/*
@@ -894,26 +914,6 @@
}
/*
- * Return TRUE if "fname" is a readable file.
- */
- int
-file_is_readable(char_u *fname)
-{
- int fd;
-
-#ifndef O_NONBLOCK
-# define O_NONBLOCK 0
-#endif
- if (*fname && !mch_isdir(fname)
- && (fd = mch_open((char *)fname, O_RDONLY | O_NONBLOCK, 0)) >= 0)
- {
- close(fd);
- return TRUE;
- }
- return FALSE;
-}
-
-/*
* "filereadable()" function
*/
void