Mercurial > vim
changeset 11935:976b480ced9a v8.0.0847
patch 8.0.0847: :argadd without argument can't handle space in file name
commit https://github.com/vim/vim/commit/398ee7326b78b892a5c8380dfe3f2521a64b4fa7
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 3 14:29:14 2017 +0200
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 03 Aug 2017 14:30:04 +0200 |
| parents | 695ef5fe791b |
| children | 84e482f5ae52 |
| files | src/ex_cmds2.c src/proto/ex_cmds2.pro src/testdir/test_arglist.vim src/version.c |
| diffstat | 4 files changed, 21 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -2320,8 +2320,8 @@ do_one_arg(char_u *str) * 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 @@ get_arglist(garray_T *gap, char_u *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. */ str = do_one_arg(str); } @@ -2355,7 +2359,7 @@ get_arglist_exp( 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 @@ do_arglist( char_u *p; int match; #endif + int arg_escaped = TRUE; /* * Set default argument for ":argadd" command. @@ -2410,12 +2415,13 @@ do_arglist( 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
--- a/src/proto/ex_cmds2.pro +++ b/src/proto/ex_cmds2.pro @@ -52,7 +52,6 @@ int can_abandon(buf_T *buf, int forceit) int check_changed_any(int hidden, int unload); int check_fname(void); 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); void set_arglist(char_u *str); void check_arg_idx(win_T *win);
--- a/src/testdir/test_arglist.vim +++ b/src/testdir/test_arglist.vim @@ -65,13 +65,19 @@ func Test_argadd() %argd edit d arga - call assert_equal(len(argv()), 1) - call assert_equal(get(argv(), 0, ''), 'd') + call assert_equal(1, len(argv())) + 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 new arga - call assert_equal(len(argv()), 0) + call assert_equal(0, len(argv())) endfunc func Init_abc()