diff options
author | Bram Moolenaar <Bram@vim.org> | 2015-01-20 19:31:02 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2015-01-20 19:31:02 +0100 |
commit | 4bde00c59575f7547ab59946aea527c5be067662 (patch) | |
tree | 444ef474a1318bc309ac5407c7b01bcf36d8db89 | |
parent | 6a6028cf4b0a2c48e34f657d478adee814d471c5 (diff) | |
download | vim-git-4bde00c59575f7547ab59946aea527c5be067662.tar.gz |
updated for version 7.4.588v7.4.588
Problem: ":0argedit foo" puts the new argument in the second place instead
of the first.
Solution: Adjust the range type. (Ingo Karkat)
-rw-r--r-- | src/ex_cmds.h | 2 | ||||
-rw-r--r-- | src/testdir/Make_amiga.mak | 2 | ||||
-rw-r--r-- | src/testdir/Make_dos.mak | 1 | ||||
-rw-r--r-- | src/testdir/Make_ming.mak | 1 | ||||
-rw-r--r-- | src/testdir/Make_os2.mak | 1 | ||||
-rw-r--r-- | src/testdir/Make_vms.mms | 1 | ||||
-rw-r--r-- | src/testdir/Makefile | 1 | ||||
-rw-r--r-- | src/testdir/test_argument_0count.in | 28 | ||||
-rw-r--r-- | src/testdir/test_argument_0count.ok | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
10 files changed, 43 insertions, 1 deletions
diff --git a/src/ex_cmds.h b/src/ex_cmds.h index 941a97d0d..21d42d55d 100644 --- 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 c8becc7a7..0e9898b9a 100644 --- 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 57f85ea67..1ba440718 100644 --- 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 5718d4601..51049fb62 100644 --- 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 1ba2dfe94..0b3ce26e9 100644 --- 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 9fecf9fa6..f57bf55a6 100644 --- 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 e76a72b00..671c30d5c 100644 --- 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 index 000000000..88317fa1f --- /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 index 000000000..ee5daea81 --- /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 9cbee6e69..2f08c2495 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 588, +/**/ 587, /**/ 586, |