diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-09 15:58:30 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-09 15:58:30 +0100 |
| commit | 69a92fb5aecdf2f9d5f6947790b18991b22d0e4c (patch) | |
| tree | 9f5510a1c9fe6449d7f9a29a1bf9507095ec42b3 /src | |
| parent | 056f700031602a2734b1ddf45f6bc2817e49b996 (diff) | |
patch 8.0.0439: ":%argdel" gives an error for an empty arglistv8.0.0439
Problem: Using ":%argdel" while the argument list is already empty gives an
error. (Pavol Juhas)
Solution: Don't give an error. (closes #1546)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_cmds2.c | 9 | ||||
| -rw-r--r-- | src/testdir/test_arglist.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 5ecb1f3d6b..f8d35dc73d 100644 --- 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) diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim index 0caead8482..d18035b3b4 100644 --- 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()) diff --git a/src/version.c b/src/version.c index 811a3d6a98..277f2d99e3 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 439, +/**/ 438, /**/ 437, |