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)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index af63b6c41058c30a071fb998eb656c126675c822..9ae8fff2a6a71ed236487b2032aaebcf7db81b98 100644 (file)
--- 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 e1ee8c23ae3a03afffd4e9cc7ba282e2dcc84707..acff49046411a9b5865d7e2ab1d73787053e42f2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    737,
 /**/
     736,
 /**/