Mercurial > vim
changeset 11103:3335c3c75611 v8.0.0439
patch 8.0.0439: ":%argdel" gives an error for an empty arglist
commit https://github.com/vim/vim/commit/69a92fb5aecdf2f9d5f6947790b18991b22d0e4c
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Mar 9 15:58:30 2017 +0100
patch 8.0.0439: ":%argdel" gives an error for an empty arglist
Problem: Using ":%argdel" while the argument list is already empty gives an
error. (Pavol Juhas)
Solution: Don't give an error. (closes #1546)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 09 Mar 2017 16:00:05 +0100 |
| parents | 85c5d024d301 |
| children | c6f6c6262418 |
| files | src/ex_cmds2.c src/testdir/test_arglist.vim src/version.c |
| diffstat | 3 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -2832,8 +2832,15 @@ ex_argdelete(exarg_T *eap) if (eap->line2 > ARGCOUNT) eap->line2 = ARGCOUNT; n = eap->line2 - eap->line1 + 1; - if (*eap->arg != NUL || n <= 0) + if (*eap->arg != NUL) + /* Can't have both a range and an argument. */ EMSG(_(e_invarg)); + else if (n <= 0) + { + /* Don't give an error for ":%argdel" if the list is empty. */ + if (eap->line1 != 1 || eap->line2 != 0) + EMSG(_(e_invrange)); + } else { for (i = eap->line1; i <= eap->line2; ++i)
--- a/src/testdir/test_arglist.vim +++ b/src/testdir/test_arglist.vim @@ -6,6 +6,10 @@ func Test_argidx() call assert_equal(2, argidx()) %argdelete call assert_equal(0, argidx()) + " doing it again doesn't result in an error + %argdelete + call assert_equal(0, argidx()) + call assert_fails('2argdelete', 'E16:') args a b c call assert_equal(0, argidx())