patch 8.1.0604: autocommand test fails on MS-Windows

Problem:    Autocommand test fails on MS-Windows.
Solution:   Use pathcmp() instead of strcmp() to check if a directory differs.

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index e700f2ed4347acd433df825e28df82158c0d5b08..466e77e9ee12cae1b7a955c88405aef350398cfd 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9185,7 +9185,7 @@ ex_cd(exarg_T *eap)
        }
 #endif
        dir_differs = new_dir == NULL || prev_dir == NULL
-                                            || STRCMP(prev_dir, new_dir) != 0;
+                       || pathcmp((char *)prev_dir, (char *)new_dir, -1) != 0;
        if (new_dir == NULL || (dir_differs && vim_chdir(new_dir)))
            EMSG(_(e_failed));
        else

diff --git a/src/misc2.c b/src/misc2.c
index 4e3b845f7021d51d440bc1f9e32e4a074e69380e..060a333ca7256504464262ec53f3268e60039d34 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3402,7 +3402,7 @@ vim_chdirfile(char_u *fname, char *trigger_autocmd)
     vim_strncpy(new_dir, fname, MAXPATHL - 1);
     *gettail_sep(new_dir) = NUL;
 
-    if (STRCMP(old_dir, new_dir) == 0)
+    if (pathcmp((char *)old_dir, (char *)new_dir, -1) == 0)
        // nothing to do
        res = OK;
     else

diff --git a/src/version.c b/src/version.c
index c73a3ed72aacc12303ae92d3c1dc8ac8836de425..10361cb099ed716baedc9c8bd57dd56236d9141f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    604,
 /**/
     603,
 /**/