diff options
| author | watiko <service@mail.watiko.net> | 2016-02-09 15:21:29 +0900 |
|---|---|---|
| committer | watiko <service@mail.watiko.net> | 2016-02-10 16:19:33 +0900 |
| commit | 6d57b48a5392988247778de7cfb8165bad8a9196 (patch) | |
| tree | 14b0823c6cac77838cd794be09385ba3d56a2495 | |
| parent | e7615ddc22944504685d0ba3957626af9354148a (diff) | |
| download | rneovim-6d57b48a5392988247778de7cfb8165bad8a9196.tar.gz rneovim-6d57b48a5392988247778de7cfb8165bad8a9196.tar.bz2 rneovim-6d57b48a5392988247778de7cfb8165bad8a9196.zip | |
vim-patch:7.4.737
Problem: On MS-Windows vimgrep over arglist doesn't work (Issue 361)
Solution: Only escape backslashes in ## expansion when it is not used as the
path separator. (James McCoy)
https://github.com/vim/vim/commit/6e8d3b0d41bcef7ebe0ba2e887eb25781e1437fe
---
Fix a lint error for the closing parenthesis.
NOLINT does not help to do this.
| -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 269f9872d0..cbe7588923 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, // 734, |