diff options
| author | Felipe Morales <hel.sheep@gmail.com> | 2015-01-31 20:10:52 -0300 |
|---|---|---|
| committer | Felipe Morales <hel.sheep@gmail.com> | 2015-04-28 23:08:32 -0300 |
| commit | 0c44d0ebfc1ffc6eb07c914acc2e4f432b96ce68 (patch) | |
| tree | a88978b953067037e2b928ab3250ed4af5a0c68c | |
| parent | 7e850a2f2aafa609457b9d6f6f637449d4113567 (diff) | |
| download | rneovim-0c44d0ebfc1ffc6eb07c914acc2e4f432b96ce68.tar.gz rneovim-0c44d0ebfc1ffc6eb07c914acc2e4f432b96ce68.tar.bz2 rneovim-0c44d0ebfc1ffc6eb07c914acc2e4f432b96ce68.zip | |
vim-patch: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)
https://code.google.com/p/vim/source/detail?name=v7-4-588
| -rw-r--r-- | src/nvim/ex_cmds.lua | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_argument_0count.in | 28 | ||||
| -rw-r--r-- | src/nvim/testdir/test_argument_0count.ok | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
5 files changed, 37 insertions, 3 deletions
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua index 194ad37682..5f60b8cb09 100644 --- a/src/nvim/ex_cmds.lua +++ b/src/nvim/ex_cmds.lua @@ -105,7 +105,7 @@ return { }, { command='argedit', - flags=bit.bor(BANG, NEEDARG, RANGE, NOTADR, FILE1, EDITCMD, ARGOPT, TRLBAR), + flags=bit.bor(BANG, NEEDARG, RANGE, NOTADR, ZEROR, FILE1, EDITCMD, ARGOPT, TRLBAR), addr_type=ADDR_ARGUMENTS, func='ex_argedit', }, diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index fa68ab8d3a..2dedc3db12 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -32,7 +32,8 @@ SCRIPTS := test_autoformat_join.out \ test_breakindent.out \ test_argument_count.out \ test_close_count.out \ - test_command_count.out + test_command_count.out \ + test_argument_0count.out SCRIPTS_GUI := test16.out diff --git a/src/nvim/testdir/test_argument_0count.in b/src/nvim/testdir/test_argument_0count.in new file mode 100644 index 0000000000..88317fa1fc --- /dev/null +++ b/src/nvim/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/nvim/testdir/test_argument_0count.ok b/src/nvim/testdir/test_argument_0count.ok new file mode 100644 index 0000000000..ee5daea812 --- /dev/null +++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c index 91de98270d..55ddcc74f1 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -191,7 +191,7 @@ static int included_patches[] = { //591 NA //590, //589 NA - //588, + 588, //587, //586 NA 585, |