diff options
| author | Felipe Morales <hel.sheep@gmail.com> | 2015-01-20 01:17:37 -0300 |
|---|---|---|
| committer | Felipe Morales <hel.sheep@gmail.com> | 2015-04-28 23:08:32 -0300 |
| commit | e42b00dc3b7fb86a3f6ca2a91c0b9cd6569bed60 (patch) | |
| tree | 3d92a934327774c3724fbcbe81c9258b2141f66a /src | |
| parent | ff70129d96f44dcb773e6ce56bc824a04ba5d9a9 (diff) | |
| download | rneovim-e42b00dc3b7fb86a3f6ca2a91c0b9cd6569bed60.tar.gz rneovim-e42b00dc3b7fb86a3f6ca2a91c0b9cd6569bed60.tar.bz2 rneovim-e42b00dc3b7fb86a3f6ca2a91c0b9cd6569bed60.zip | |
vim-patch:7.4.568
Problem: Giving an error for ":0wincmd w" is a problem for some
plugins.
Solution: Allow the zero in the range. (Marcin Szamotulski)
https://code.google.com/p/vim/source/detail?r=v7-4-568
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 13 | ||||
| -rw-r--r-- | src/nvim/testdir/test_command_count.ok | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 78bfaad959..5dd744834e 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -3574,11 +3574,11 @@ static char_u *invalid_range(exarg_T *eap) } if (eap->argt & RANGE) { - switch (eap->addr_type) { + switch(eap->addr_type) { case ADDR_LINES: - if (!(eap->argt & NOTADR) && - eap->line2 > - curbuf->b_ml.ml_line_count + (eap->cmdidx == CMD_diffget)) { + if (!(eap->argt & NOTADR) + && eap->line2 > curbuf->b_ml.ml_line_count + + (eap->cmdidx == CMD_diffget)) { return (char_u *)_(e_invrange); } break; @@ -3588,11 +3588,12 @@ static char_u *invalid_range(exarg_T *eap) } break; case ADDR_BUFFERS: - if (eap->line1 < firstbuf->b_fnum || eap->line2 > lastbuf->b_fnum) { + if (eap->line1 < firstbuf->b_fnum + || eap->line2 > lastbuf->b_fnum) { return (char_u *)_(e_invrange); } break; - case ADDR_LOADED_BUFFERS: + case ADDR_LOADED_BUFFERS: buf = firstbuf; while (buf->b_ml.ml_mfp == NULL) { if (buf->b_next == NULL) { diff --git a/src/nvim/testdir/test_command_count.ok b/src/nvim/testdir/test_command_count.ok index a936715b36..7219b28e16 100644 --- a/src/nvim/testdir/test_command_count.ok +++ b/src/nvim/testdir/test_command_count.ok @@ -21,8 +21,8 @@ LocalRangeLines 2 5 4argu d 1argu a 100b E16: Invalid range -0close E16: Invalid range -$close 4 +0close +$close 3 $+close E16: Invalid range $tabe 2 $+tabe E16: Invalid range diff --git a/src/nvim/version.c b/src/nvim/version.c index 2d0c28b385..5e093cc728 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -211,7 +211,7 @@ static int included_patches[] = { //571 NA //570 NA //569, - //568, + 568, 567, 566, 565, |