patch 7.4.1161
Problem: ":argadd" without argument is supposed to add the current buffer
name to the arglist.
Solution: Make it work as documented. (Coot, closes #577)
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 4b5f684..78c0afa 100644
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -128,7 +128,7 @@
BANG|FILES|EDITCMD|ARGOPT|TRLBAR,
ADDR_LINES),
EX(CMD_argadd, "argadd", ex_argadd,
- BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILES|TRLBAR,
+ BANG|RANGE|NOTADR|ZEROR|FILES|TRLBAR,
ADDR_ARGUMENTS),
EX(CMD_argdelete, "argdelete", ex_argdelete,
BANG|RANGE|NOTADR|FILES|TRLBAR,
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 59bf945..bc7193d 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2090,6 +2090,16 @@
#endif
/*
+ * Set default argument for ":argadd" command.
+ */
+ if (what == AL_ADD && *str == NUL)
+ {
+ if (curbuf->b_ffname == NULL)
+ return FAIL;
+ str = curbuf->b_fname;
+ }
+
+ /*
* Collect all file name arguments in "new_ga".
*/
if (get_arglist(&new_ga, str) == FAIL)
diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim
index 281ac7a..4244344 100644
--- a/src/testdir/test_arglist.vim
+++ b/src/testdir/test_arglist.vim
@@ -57,6 +57,17 @@
+2argadd y
call Assert_argc(['a', 'b', 'c', 'x', 'y'])
call assert_equal(1, argidx())
+
+ %argd
+ edit d
+ arga
+ call assert_equal(len(argv()), 1)
+ call assert_equal(get(argv(), 0, ''), 'd')
+
+ %argd
+ new
+ arga
+ call assert_equal(len(argv()), 0)
endfunc
func Init_abc()
diff --git a/src/version.c b/src/version.c
index 25ba3b9..ca83550 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1161,
+/**/
1160,
/**/
1159,
