Mercurial > vim
changeset 7647:65b2d593c203 v7.4.1123
commit https://github.com/vim/vim/commit/a24f0a550fed3d9773800cf6be4efd072fff20ec
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 17 19:39:00 2016 +0100
patch 7.4.1123
Problem: Using ":argadd" when there are no arguments results in the second
argument to be the current one. (Yegappan Lakshmanan)
Solution: Correct the w_arg_idx value.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 17 Jan 2016 19:45:04 +0100 |
| parents | a9a6001dc181 |
| children | bfc4a1d7725c |
| files | src/ex_cmds2.c src/testdir/test_arglist.vim src/version.c |
| diffstat | 3 files changed, 57 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -2836,6 +2836,7 @@ alist_add_list(count, files, after) int after; /* where to add: 0 = before first one */ { int i; + int old_argcount = ARGCOUNT; if (ga_grow(&ALIST(curwin)->al_ga, count) == OK) { @@ -2852,8 +2853,8 @@ alist_add_list(count, files, after) ARGLIST[after + i].ae_fnum = buflist_add(files[i], BLN_LISTED); } ALIST(curwin)->al_ga.ga_len += count; - if (curwin->w_arg_idx >= after) - ++curwin->w_arg_idx; + if (old_argcount > 0 && curwin->w_arg_idx >= after) + curwin->w_arg_idx += count; return after; }
--- a/src/testdir/test_arglist.vim +++ b/src/testdir/test_arglist.vim @@ -20,3 +20,55 @@ func Test_argidx() 1argdelete call assert_equal(0, argidx()) endfunc + +func Test_argadd() + %argdelete + argadd a b c + call assert_equal(0, argidx()) + + %argdelete + argadd a + call assert_equal(0, argidx()) + argadd b c d + call assert_equal(0, argidx()) + + call Init_abc() + argadd x + call Assert_argc(['a', 'b', 'x', 'c']) + call assert_equal(1, argidx()) + + call Init_abc() + 0argadd x + call Assert_argc(['x', 'a', 'b', 'c']) + call assert_equal(2, argidx()) + + call Init_abc() + 1argadd x + call Assert_argc(['a', 'x', 'b', 'c']) + call assert_equal(2, argidx()) + + call Init_abc() + $argadd x + call Assert_argc(['a', 'b', 'c', 'x']) + call assert_equal(1, argidx()) + + call Init_abc() + $argadd x + +2argadd y + call Assert_argc(['a', 'b', 'c', 'x', 'y']) + call assert_equal(1, argidx()) +endfunc + +func Init_abc() + args a b c + next +endfunc + +func Assert_argc(l) + call assert_equal(len(a:l), argc()) + let i = 0 + while i < len(a:l) && i < argc() + call assert_equal(a:l[i], argv(i)) + let i += 1 + endwhile +endfunc