diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-17 04:04:27 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-17 04:04:27 -0500 |
| commit | 9198b06ea67973905f2d6cbaadd56b1c21a64373 (patch) | |
| tree | 7ccc57d268686a65ad3f5d52774e0c1552ab8280 | |
| parent | 560a346d57f29ff549047b6d9e4434ddc6a3d0ed (diff) | |
| parent | 14c543231cfb1c34143d5d014c59f2b41cedffc3 (diff) | |
| download | rneovim-9198b06ea67973905f2d6cbaadd56b1c21a64373.tar.gz rneovim-9198b06ea67973905f2d6cbaadd56b1c21a64373.tar.bz2 rneovim-9198b06ea67973905f2d6cbaadd56b1c21a64373.zip | |
Merge pull request #4229 from jbradaric/vim-7.4.847
vim-patch:7.4.847
| -rw-r--r-- | src/nvim/search.c | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c index 827473e55d..fffae1ecb2 100644 --- a/src/nvim/search.c +++ b/src/nvim/search.c @@ -3144,10 +3144,12 @@ current_block ( } if (VIsual_active) { - if (*p_sel == 'e') - ++curwin->w_cursor.col; - if (sol && gchar_cursor() != NUL) - inc(&curwin->w_cursor); /* include the line break */ + if (*p_sel == 'e') { + inc(&curwin->w_cursor); + } + if (sol && gchar_cursor() != NUL) { + inc(&curwin->w_cursor); // include the line break + } VIsual = start_pos; VIsual_mode = 'v'; redraw_curbuf_later(INVERTED); /* update the inversion */ diff --git a/src/nvim/version.c b/src/nvim/version.c index ef38a9196f..2d241204a6 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -441,7 +441,7 @@ static int included_patches[] = { // 850 NA 849, 848, - // 847, + 847, // 846 NA // 845, 844, |