diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2016-03-31 19:22:38 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2016-03-31 19:22:38 -0300 |
| commit | b8643f69c192c32160a9f2ce7936afbe885b01e7 (patch) | |
| tree | a17f68bb04725e5198212047dc55d5ef1df94aec /src | |
| parent | 4b8f27338f1a4f393b1a6c6e219a073ca9bf39a7 (diff) | |
| parent | 7558f42f7d9900d37a1915ce78f1102ee251d420 (diff) | |
| download | rneovim-b8643f69c192c32160a9f2ce7936afbe885b01e7.tar.gz rneovim-b8643f69c192c32160a9f2ce7936afbe885b01e7.tar.bz2 rneovim-b8643f69c192c32160a9f2ce7936afbe885b01e7.zip | |
Merge PR #4492 'vim-patch:7.4.{1641,1643,1652,1654}'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index f71620a7b4..3c67625d1c 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -21993,7 +21993,15 @@ repeat: } if (src[*usedlen] == ':' && src[*usedlen + 1] == 'S') { + // vim_strsave_shellescape() needs a NUL terminated string. + c = (*fnamep)[*fnamelen]; + if (c != NUL) { + (*fnamep)[*fnamelen] = NUL; + } p = vim_strsave_shellescape(*fnamep, false, false); + if (c != NUL) { + (*fnamep)[*fnamelen] = c; + } xfree(*bufp); *bufp = *fnamep = p; *fnamelen = STRLEN(p); diff --git a/src/nvim/version.c b/src/nvim/version.c index 98abb30b00..8cd0a13363 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -69,6 +69,10 @@ static char *features[] = { // clang-format off static int included_patches[] = { + 1654, + 1652, + 1643, + 1641, 1574, 1570, 1511, |