thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 7.4.1119

Browse Source 
Problem:    argidx() has a wrong value after ":%argdelete". (Yegappan
            Lakshmanan)
Solution:   Correct the value of w_arg_idx.  Add a test.
This commit is contained in:
Bram Moolenaar 2016-01-17 18:04:33 +01:00
parent a99b90437a
commit 72defda84e
4 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ex_cmds2.c
View File

@ -2562,6 +2562,10 @@ ex_argdelete(eap)
curwin->w_arg_idx -= n;
else if (curwin->w_arg_idx > eap->line1)
curwin->w_arg_idx = eap->line1;
if (ARGCOUNT == 0)
curwin->w_arg_idx = 0;
else if (curwin->w_arg_idx >= ARGCOUNT)
curwin->w_arg_idx = ARGCOUNT - 1;
}
}
else if (*eap->arg == NUL)

3
src/testdir/Make_all.mak
View File

@ -171,7 +171,8 @@ SCRIPTS_GUI = test16.out
# Tests using runtest.vim.vim.
# Keep test_alot.res as the last one, sort the others.
NEW_TESTS = test_assert.res \
NEW_TESTS = test_arglist.res \
test_assert.res \
test_cdo.res \
test_hardcopy.res \
test_increment.res \

22
src/testdir/test_arglist.vim Normal file
View File

@ -0,0 +1,22 @@
" Test argument list commands
func Test_argidx()
args a b c
last
call assert_equal(2, argidx())
%argdelete
call assert_equal(0, argidx())
args a b c
call assert_equal(0, argidx())
next
call assert_equal(1, argidx())
next
call assert_equal(2, argidx())
1argdelete
call assert_equal(1, argidx())
1argdelete
call assert_equal(0, argidx())
1argdelete
call assert_equal(0, argidx())
endfunc

2
src/version.c
View File

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