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)

diff --git a/src/evalfunc.c b/src/evalfunc.c
index 3c6421206102a474582b3f0f3688c5a0bbeea2ab..8a1fcef14b154efeffe0947974e739a230a63b8c 100644 (file)
--- 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);
+    if (rettv->vval.v_string != NULL)
+       slash_adjust(rettv->vval.v_string);
 #endif
-    }
 }
 
 /*

diff --git a/src/version.c b/src/version.c
index b88258e8bbfbd738dda6fc478b6b48587516b90f..1077b9abeee3fa724c55a2ce74c5481efd454293 100644 (file)
--- 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,
 /**/