updated for version 7.4.588

Problem:    ":0argedit foo" puts the new argument in the second place instead
            of the first.
Solution:   Adjust the range type. (Ingo Karkat)

diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 941a97d0d9016377d92a5e78d0e0b9349bdaa0e6..21d42d55d4905605998917ebb2a4182efc6465b1 100644 (file)
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -136,7 +136,7 @@ EX(CMD_argdo,               "argdo",        ex_listdo,
                        BANG|NEEDARG|EXTRA|NOTRLCOM|RANGE|NOTADR|DFLALL,
                        ADDR_ARGUMENTS),
 EX(CMD_argedit,                "argedit",      ex_argedit,
-                       BANG|NEEDARG|RANGE|NOTADR|FILE1|EDITCMD|ARGOPT|TRLBAR,
+                       BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILE1|EDITCMD|ARGOPT|TRLBAR,
                        ADDR_ARGUMENTS),
 EX(CMD_argglobal,      "argglobal",    ex_args,
                        BANG|FILES|EDITCMD|ARGOPT|TRLBAR,

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index c8becc7a7d73c93a71a8438ba3c7932e7b7c7619..0e9898b9ad16bad83463134071041ebaf247c8b3 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -36,6 +36,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test94.out test95.out test96.out test97.out test98.out \
                test99.out test100.out test101.out test102.out test103.out \
                test104.out test105.out test106.out test107.out \
+               test_argument_0count.out \
                test_argument_count.out \
                test_autoformat_join.out \
                test_breakindent.out \
@@ -175,6 +176,7 @@ test104.out: test104.in
 test105.out: test105.in
 test106.out: test106.in
 test107.out: test107.in
+test_argument_0count.out: test_argument_0count.in
 test_argument_count.out: test_argument_count.in
 test_autoformat_join.out: test_autoformat_join.in
 test_breakindent.out: test_breakindent.in

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 57f85ea67b448940ae84b5457892e87c5ad073c4..1ba440718d556aa59af0b65e5a98a239ea73a375 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -35,6 +35,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test94.out test95.out test96.out test98.out test99.out \
                test100.out test101.out test102.out test103.out test104.out \
                test105.out test106.out  test107.out\
+               test_argument_0count.out \
                test_argument_count.out \
                test_autoformat_join.out \
                test_breakindent.out \

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 5718d46018f1a6f40a52599d5c2ecef417e657aa..51049fb620e804cfc41559afc3a6b5859adfe8d6 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -57,6 +57,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test94.out test95.out test96.out test98.out test99.out \
                test100.out test101.out test102.out test103.out test104.out \
                test105.out test106.out test107.out \
+               test_argument_0count.out \
                test_argument_count.out \
                test_autoformat_join.out \
                test_breakindent.out \

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 1ba2dfe9465212a5e58f224cac63f92702a714cd..0b3ce26e9314878098b6cee7c91fd5dc70c657cf 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -37,6 +37,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test94.out test95.out test96.out test98.out test99.out \
                test100.out test101.out test102.out test103.out test104.out \
                test105.out test106.out test107.out \
+               test_argument_0count.out \
                test_argument_count.out \
                test_autoformat_join.out \
                test_breakindent.out \

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 9fecf9fa63cc4cf08b215002f6d065cc7af3a51e..f57bf55a6b3c23b01d374f588887427db4d5a69d 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -96,6 +96,7 @@ SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
         test95.out test96.out test98.out test99.out \
         test100.out test101.out test103.out test104.out \
         test105.out test106.out test107.out \
+        test_argument_0count.out \
         test_argument_count.out \
         test_autoformat_join.out \
         test_breakindent.out \

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index e76a72b009222288d1c2a379e65640305e7e995e..671c30d5c32a89f59c470c6ffef78ee8bcad75f9 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -33,6 +33,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
                test94.out test95.out test96.out test97.out test98.out \
                test99.out test100.out test101.out test102.out test103.out \
                test104.out test105.out test106.out test107.out \
+               test_argument_0count.out \
                test_argument_count.out \
                test_autoformat_join.out \
                test_breakindent.out \

diff --git a/src/testdir/test_argument_0count.in b/src/testdir/test_argument_0count.in
new file mode 100644 (file)
index 0000000..88317fa
--- /dev/null
+++ b/src/testdir/test_argument_0count.in
@@ -0,0 +1,28 @@
+Tests for :0argadd and :0argedit     vim: set ft=vim :
+
+STARTTEST
+:so small.vim
+:let arglists = []
+:%argd
+:arga a b c d
+:2argu
+:0arga added
+:call add(arglists, argv())
+:2argu
+:arga third
+:call add(arglists, argv())
+:%argd
+:arga a b c d
+:2argu
+:0arge edited
+:call add(arglists, argv())
+:2argu
+:arga third
+:call add(arglists, argv())
+:e! test.out
+:call append(0, map(copy(arglists), 'join(v:val, " ")'))
+:w
+:qa!
+ENDTEST
+
+

diff --git a/src/testdir/test_argument_0count.ok b/src/testdir/test_argument_0count.ok
new file mode 100644 (file)
index 0000000..ee5daea
--- /dev/null
+++ b/src/testdir/test_argument_0count.ok
@@ -0,0 +1,5 @@
+added a b c d
+added a third b c d
+edited a b c d
+edited a third b c d
+

diff --git a/src/version.c b/src/version.c
index 9cbee6e69a18dd8bef3f892a36418a779a36f685..2f08c2495cc29c35c44c562fff571dac7fdaf4e0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    588,
 /**/
     587,
 /**/