diff options
| -rw-r--r-- | src/nvim/ex_cmds2.c | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test/functional/legacy/arglist_spec.lua | 31 |
3 files changed, 40 insertions, 3 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 12efddc205..18e09a7619 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -1861,11 +1861,17 @@ void ex_argdelete(exarg_T *eap) } else if (curwin->w_arg_idx > eap->line1) { curwin->w_arg_idx = (int)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) + } else if (*eap->arg == NUL) { EMSG(_(e_argreq)); - else + } else { do_arglist(eap->arg, AL_DEL, 0); + } maketitle(); } diff --git a/src/nvim/version.c b/src/nvim/version.c index b55d31ea76..937d481e19 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -563,7 +563,7 @@ static int included_patches[] = { // 1122 NA // 1121, 1120, - // 1119, + 1119, 1118, 1117, 1116, diff --git a/test/functional/legacy/arglist_spec.lua b/test/functional/legacy/arglist_spec.lua new file mode 100644 index 0000000000..a569479b62 --- /dev/null +++ b/test/functional/legacy/arglist_spec.lua @@ -0,0 +1,31 @@ +-- Test argument list commands + +local helpers = require('test.functional.helpers') +local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert +local execute, expect = helpers.execute, helpers.expect +local eq, eval = helpers.eq, helpers.eval + +describe('argument list commands', function() + before_each(clear) + + it('is working', function() + execute('args a b c') + execute('last') + eq(2, eval('argidx()')) + execute('%argdelete') + eq(0, eval('argidx()')) + + execute('args a b c') + eq(0, eval('argidx()')) + execute('next') + eq(1, eval('argidx()')) + execute('next') + eq(2, eval('argidx()')) + execute('1argdelete') + eq(1, eval('argidx()')) + execute('1argdelete') + eq(0, eval('argidx()')) + execute('1argdelete') + eq(0, eval('argidx()')) + end) +end) |