Merge pull request #4205 from watiko/vim-7.4.737

vim-patch:7.4.737
This commit is contained in:
Florian Walch 2016-02-10 20:51:14 +01:00
commit 84281bf675
2 changed files with 14 additions and 8 deletions

View File

@ -8283,16 +8283,22 @@ static char_u *arg_all(void)
retval[len] = ' '; retval[len] = ' ';
++len; ++len;
} }
for (; *p != NUL; ++p) { for (; *p != NUL; p++) {
if (*p == ' ' || *p == '\\') { if (*p == ' '
/* insert a backslash */ #ifndef BACKSLASH_IN_FILENAME
if (retval != NULL) || *p == '\\'
#endif
) {
// insert a backslash
if (retval != NULL) {
retval[len] = '\\'; retval[len] = '\\';
++len; }
len++;
} }
if (retval != NULL) if (retval != NULL) {
retval[len] = *p; retval[len] = *p;
++len; }
len++;
} }
} }

View File

@ -551,7 +551,7 @@ static int included_patches[] = {
740, 740,
739, 739,
// 738 NA // 738 NA
// 737, 737,
736, 736,
// 735 NA // 735 NA
// 734, // 734,