summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-06-09 21:33:31 +0200
committerBram Moolenaar <Bram@vim.org>2015-06-09 21:33:31 +0200
commit6e8d3b0d41bcef7ebe0ba2e887eb25781e1437fe (patch)
treee4f19fa1baa4ddd7ad3ab513cd1d9f99d452f638
parentb878bbbca67c384101c2ebb822e390f0feda9489 (diff)
downloadvim-git-6e8d3b0d41bcef7ebe0ba2e887eb25781e1437fe.tar.gz
patch 7.4.737v7.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)
-rw-r--r--src/ex_docmd.c6
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index af63b6c41..9ae8fff2a 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10746,7 +10746,11 @@ arg_all()
}
for ( ; *p != NUL; ++p)
{
- if (*p == ' ' || *p == '\\')
+ if (*p == ' '
+#ifndef BACKSLASH_IN_FILENAME
+ || *p == '\\'
+#endif
+ )
{
/* insert a backslash */
if (retval != NULL)
diff --git a/src/version.c b/src/version.c
index e1ee8c23a..acff49046 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 737,
+/**/
736,
/**/
735,