patch 8.0.0847: :argadd without argument can't handle space in file name
Problem: :argadd without argument can't handle space in file name. (Harm te
Hennepe)
Solution: Escape the space. (Yasuhiro Matsumoto, closes #1917)
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 687bbae..381c5d1 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2320,8 +2320,8 @@
* Separate the arguments in "str" and return a list of pointers in the
* growarray "gap".
*/
- int
-get_arglist(garray_T *gap, char_u *str)
+ static int
+get_arglist(garray_T *gap, char_u *str, int escaped)
{
ga_init2(gap, (int)sizeof(char_u *), 20);
while (*str != NUL)
@@ -2333,6 +2333,10 @@
}
((char_u **)gap->ga_data)[gap->ga_len++] = str;
+ /* If str is escaped, don't handle backslashes or spaces */
+ if (!escaped)
+ return OK;
+
/* Isolate one argument, change it in-place, put a NUL after it. */
str = do_one_arg(str);
}
@@ -2355,7 +2359,7 @@
garray_T ga;
int i;
- if (get_arglist(&ga, str) == FAIL)
+ if (get_arglist(&ga, str, TRUE) == FAIL)
return FAIL;
if (wig == TRUE)
i = expand_wildcards(ga.ga_len, (char_u **)ga.ga_data,
@@ -2401,6 +2405,7 @@
char_u *p;
int match;
#endif
+ int arg_escaped = TRUE;
/*
* Set default argument for ":argadd" command.
@@ -2410,12 +2415,13 @@
if (curbuf->b_ffname == NULL)
return FAIL;
str = curbuf->b_fname;
+ arg_escaped = FALSE;
}
/*
* Collect all file name arguments in "new_ga".
*/
- if (get_arglist(&new_ga, str) == FAIL)
+ if (get_arglist(&new_ga, str, arg_escaped) == FAIL)
return FAIL;
#ifdef FEAT_LISTCMDS