From 9eb76af451ddd8eaad0cd5dd629f18c4f4035171 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 16 Dec 2018 16:30:21 +0100 Subject: 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. --- src/ex_docmd.c | 2 +- src/misc2.c | 2 +- src/version.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ex_docmd.c b/src/ex_docmd.c index e700f2ed43..466e77e9ee 100644 --- 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 4e3b845f70..060a333ca7 100644 --- 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 c73a3ed72a..10361cb099 100644 --- 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, /**/ -- cgit v1.2.3