diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-02 14:25:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-02 14:25:05 +0200 |
| commit | 3c5b8cd25485183ff7ce737e4dac069541210f6c (patch) | |
| tree | 2846ccff4b6f07aa6a2478dd44b2fc8de5bf0c25 | |
| parent | 94f01956a583223dafe24135489d0ab1100ab0ad (diff) | |
| download | vim-git-3c5b8cd25485183ff7ce737e4dac069541210f6c.tar.gz | |
patch 8.1.0343: 'shellslash' is not used for getcwd() with local directoryv8.1.0343
Problem: 'shellslash' is not used for getcwd() with local directory.
(Daniel Hahler)
Solution: Call slash_adjust() later. (closes #3399)
| -rw-r--r-- | src/evalfunc.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 3c6421206..8a1fcef14 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); + if (rettv->vval.v_string != NULL) + slash_adjust(rettv->vval.v_string); #endif - } } /* diff --git a/src/version.c b/src/version.c index b88258e8b..1077b9abe 100644 --- 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, |