diff options
| author | Florian Walch <florian@fwalch.com> | 2016-02-10 20:51:14 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2016-02-10 20:51:14 +0100 |
| commit | 84281bf675f77f417d26a68611406ef43fd82f7f (patch) | |
| tree | db599e7cea0f55e8040421303f07f2e60cba0707 | |
| parent | 953e140a188b30754659272a23f79d1594da9c88 (diff) | |
| parent | 6d57b48a5392988247778de7cfb8165bad8a9196 (diff) | |
| download | rneovim-84281bf675f77f417d26a68611406ef43fd82f7f.tar.gz rneovim-84281bf675f77f417d26a68611406ef43fd82f7f.tar.bz2 rneovim-84281bf675f77f417d26a68611406ef43fd82f7f.zip | |
Merge pull request #4205 from watiko/vim-7.4.737
vim-patch:7.4.737
| -rw-r--r-- | src/nvim/ex_docmd.c | 20 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 50513c0a6a..d6976bcb8f 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -8283,16 +8283,22 @@ static char_u *arg_all(void) retval[len] = ' '; ++len; } - for (; *p != NUL; ++p) { - if (*p == ' ' || *p == '\\') { - /* insert a backslash */ - if (retval != NULL) + for (; *p != NUL; p++) { + if (*p == ' ' +#ifndef BACKSLASH_IN_FILENAME + || *p == '\\' +#endif + ) { + // insert a backslash + if (retval != NULL) { retval[len] = '\\'; - ++len; + } + len++; } - if (retval != NULL) + if (retval != NULL) { retval[len] = *p; - ++len; + } + len++; } } diff --git a/src/nvim/version.c b/src/nvim/version.c index ba7f1e0262..487f3fc27b 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -551,7 +551,7 @@ static int included_patches[] = { 740, 739, // 738 NA - // 737, + 737, 736, // 735 NA // 734, |