# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1451597405 -3600
# Node ID 37092e334ef20c1a085279b20ffcf35845646e18
# Parent  3908cfa1a9a5349966f01869c6f99f9e9b9aefd2
commit https://github.com/vim/vim/commit/06b0734d9cd2f39d4c12c7fd89a100eadbe5be78
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Dec 31 22:26:28 2015 +0100

    patch 7.4.1014
    Problem:    fnamemodify('.', ':.') returns an empty string in Cygwin.
    Solution:   Use CCP_RELATIVE in the call to cygwin_conv_path. (Jacob Niehus,
                closes https://github.com/vim/vim/issues/505)

diff --git a/src/os_unix.c b/src/os_unix.c
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2464,7 +2464,10 @@ mch_FullName(fname, buf, len, force)
      * This helps for when "/etc/hosts" is a symlink to "c:/something/hosts".
      */
 # if CYGWIN_VERSION_DLL_MAJOR >= 1007
-    cygwin_conv_path(CCP_WIN_A_TO_POSIX, fname, posix_fname, MAXPATHL);
+    /* Use CCP_RELATIVE to avoid that it sometimes returns a path that ends in
+     * a forward slash. */
+    cygwin_conv_path(CCP_WIN_A_TO_POSIX | CCP_RELATIVE,
+		     fname, posix_fname, MAXPATHL);
 # else
     cygwin_conv_to_posix_path(fname, posix_fname);
 # endif
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1014,
+/**/
     1013,
 /**/
     1012,