From 3c5b8cd25485183ff7ce737e4dac069541210f6c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 2 Sep 2018 14:25:05 +0200 Subject: [PATCH] patch 8.1.0343: 'shellslash' is not used for getcwd() with local directory Problem: 'shellslash' is not used for getcwd() with local directory. (Daniel Hahler) Solution: Call slash_adjust() later. (closes #3399) --- src/evalfunc.c | 8 ++++---- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/evalfunc.c b/src/evalfunc.c index 3c64212061..8a1fcef14b 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -4955,11 +4955,11 @@ f_getcwd(typval_T *argvars, typval_T *rettv) vim_free(cwd); } } -#ifdef BACKSLASH_IN_FILENAME - if (rettv->vval.v_string != NULL) - slash_adjust(rettv->vval.v_string); -#endif } +#ifdef BACKSLASH_IN_FILENAME + if (rettv->vval.v_string != NULL) + slash_adjust(rettv->vval.v_string); +#endif } /* diff --git a/src/version.c b/src/version.c index b88258e8bb..1077b9abee 100644 --- a/src/version.c +++ b/src/version.c @@ -794,6 +794,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 343, /**/ 342, /**/