Mercurial > vim

changeset 14660:98d48a5e608b v8.1.0343

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0343: 'shellslash' is not used for getcwd() with local directory commit https://github.com/vim/vim/commit/3c5b8cd25485183ff7ce737e4dac069541210f6c Author: Bram Moolenaar <Bram@vim.org> Date: Sun Sep 2 14:25:05 2018 +0200 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)
author Christian Brabandt <cb@256bit.org>
date Sun, 02 Sep 2018 14:30:05 +0200
parents f862bf42fbab
children 2bfea5a64f00
files src/evalfunc.c src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -4955,11 +4955,11 @@ f_getcwd(typval_T *argvars, typval_T *re
 		vim_free(cwd);
 	    }
 	}
+    }
 #ifdef BACKSLASH_IN_FILENAME
-	if (rettv->vval.v_string != NULL)
-	    slash_adjust(rettv->vval.v_string);
-#endif
-    }
+    if (rettv->vval.v_string != NULL)
+	slash_adjust(rettv->vval.v_string);
+#endif
 }
 
 /*
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    343,
+/**/
     342,
 /**/
     341,