summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-16 16:30:21 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-16 16:30:21 +0100
commit9eb76af451ddd8eaad0cd5dd629f18c4f4035171 (patch)
tree0959eb7a0e021fbb8af4f77ddafd253abd84ceb1
parente751a5f531c1ceb58dacc7c280fdaae0df2c71c7 (diff)
downloadvim-git-9eb76af451ddd8eaad0cd5dd629f18c4f4035171.tar.gz
patch 8.1.0604: autocommand test fails on MS-Windowsv8.1.0604
Problem: Autocommand test fails on MS-Windows. Solution: Use pathcmp() instead of strcmp() to check if a directory differs.
-rw-r--r--src/ex_docmd.c2
-rw-r--r--src/misc2.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index e700f2ed4..466e77e9e 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 4e3b845f7..060a333ca 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 c73a3ed72..10361cb09 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 604,
+/**/
603,
/**/
602,