aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.0.0847: :argadd without argument can't handle space in file name

Browse Source 
Problem:    :argadd without argument can't handle space in file name. (Harm te
            Hennepe)
Solution:   Escape the space. (Yasuhiro Matsumoto, closes #1917)
This commit is contained in:
Bram Moolenaar
2017-08-03 14:29:14 +02:00
parent 7c9aec4ac8
commit 398ee7326b
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ex_cmds2.c
View File

@@ -2320,8 +2320,8 @@ do_one_arg(char_u *str)
* Separate the arguments in "str" and return a list of pointers in the * Separate the arguments in "str" and return a list of pointers in the
* growarray "gap". * growarray "gap".
*/ */
int static int
get_arglist(garray_T *gap, char_u *str) get_arglist(garray_T *gap, char_u *str, int escaped)
{ {
ga_init2(gap, (int)sizeof(char_u *), 20); ga_init2(gap, (int)sizeof(char_u *), 20);
while (*str != NUL) while (*str != NUL)
@@ -2333,6 +2333,10 @@ get_arglist(garray_T *gap, char_u *str)
} }
((char_u **)gap->ga_data)[gap->ga_len++] = str; ((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. */ /* Isolate one argument, change it in-place, put a NUL after it. */
str = do_one_arg(str); str = do_one_arg(str);
} }
@@ -2355,7 +2359,7 @@ get_arglist_exp(
garray_T ga; garray_T ga;
int i; int i;
if (get_arglist(&ga, str) == FAIL) if (get_arglist(&ga, str, TRUE) == FAIL)
return FAIL; return FAIL;
if (wig == TRUE) if (wig == TRUE)
i = expand_wildcards(ga.ga_len, (char_u **)ga.ga_data, i = expand_wildcards(ga.ga_len, (char_u **)ga.ga_data,
@@ -2401,6 +2405,7 @@ do_arglist(
char_u *p; char_u *p;
int match; int match;
#endif #endif
int arg_escaped = TRUE;
/* /*
* Set default argument for ":argadd" command. * Set default argument for ":argadd" command.
@@ -2410,12 +2415,13 @@ do_arglist(
if (curbuf->b_ffname == NULL) if (curbuf->b_ffname == NULL)
return FAIL; return FAIL;
str = curbuf->b_fname; str = curbuf->b_fname;
arg_escaped = FALSE;
} }
/* /*
* Collect all file name arguments in "new_ga". * 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; return FAIL;
#ifdef FEAT_LISTCMDS #ifdef FEAT_LISTCMDS

1
src/proto/ex_cmds2.pro
View File

@@ -52,7 +52,6 @@ int can_abandon(buf_T *buf, int forceit);
int check_changed_any(int hidden, int unload); int check_changed_any(int hidden, int unload);
int check_fname(void); int check_fname(void);
int buf_write_all(buf_T *buf, int forceit); int buf_write_all(buf_T *buf, int forceit);
int get_arglist(garray_T *gap, char_u *str);
int get_arglist_exp(char_u *str, int *fcountp, char_u ***fnamesp, int wig); int get_arglist_exp(char_u *str, int *fcountp, char_u ***fnamesp, int wig);
void set_arglist(char_u *str); void set_arglist(char_u *str);
void check_arg_idx(win_T *win); void check_arg_idx(win_T *win);

12
src/testdir/test_arglist.vim
View File

@@ -65,13 +65,19 @@ func Test_argadd()
%argd %argd
edit d edit d
arga arga
call assert_equal(len(argv()), 1) call assert_equal(1, len(argv()))
call assert_equal(get(argv(), 0, ''), 'd') call assert_equal('d', get(argv(), 0, ''))
%argd
edit some\ file
arga
call assert_equal(1, len(argv()))
call assert_equal('some file', get(argv(), 0, ''))
%argd %argd
new new
arga arga
call assert_equal(len(argv()), 0) call assert_equal(0, len(argv()))
endfunc endfunc
func Init_abc() func Init_abc()

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
847,
/**/ /**/
846, 846,
/**/ /**/