summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-04-26 14:26:37 +0000
committerBram Moolenaar <Bram@vim.org>2007-04-26 14:26:37 +0000
commita24424370ca347c0ee882fa891d69cf5a6fad807 (patch)
tree7d2510b01984ce924d6a13951e74472bdaa16049
parent053b9fa9c2eea6b48fb7ef1dfffc7639b98458d7 (diff)
updated for version 7.0-228v7.0.228
-rw-r--r--src/os_unix.c13
-rw-r--r--src/version.c2
2 files changed, 15 insertions, 0 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 047bd84b30..5195b6b7b1 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -55,6 +55,12 @@
# endif
#endif
+#ifdef __CYGWIN__
+# ifndef WIN32
+# include <sys/cygwin.h> /* for cygwin_conv_to_posix_path() */
+# endif
+#endif
+
#if defined(HAVE_SELECT)
extern int select __ARGS((int, fd_set *, fd_set *, fd_set *, struct timeval *));
#endif
@@ -2230,6 +2236,13 @@ mch_FullName(fname, buf, len, force)
fname = vms_fixfilename(fname);
#endif
+#ifdef __CYGWIN__
+ /*
+ * This helps for when "/etc/hosts" is a symlink to "c:/something/hosts".
+ */
+ cygwin_conv_to_posix_path(fname, fname);
+#endif
+
/* expand it if forced or not an absolute path */
if (force || !mch_isFullName(fname))
{
diff --git a/src/version.c b/src/version.c
index dc85d40a6d..0dd549fb77 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 228,
+/**/
227,
/**/
226,