aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJurica Bradaric <jbradaric@gmail.com>2016-02-09 23:37:06 +0100
committerJurica Bradaric <jbradaric@gmail.com>2016-02-10 22:35:24 +0100
commit14c543231cfb1c34143d5d014c59f2b41cedffc3 (patch)
tree6413ac9ebf9cc9cdcb995e74a8248b5b4e7e2800
parent84281bf675f77f417d26a68611406ef43fd82f7f (diff)
downloadrneovim-14c543231cfb1c34143d5d014c59f2b41cedffc3.tar.gz
rneovim-14c543231cfb1c34143d5d014c59f2b41cedffc3.tar.bz2
rneovim-14c543231cfb1c34143d5d014c59f2b41cedffc3.zip
vim-patch:7.4.847
Problem: "vi)d" may leave a character behind. Solution: Skip over multi-byte character. (Christian Brabandt) https://github.com/vim/vim/commit/8667d66ca923d361e00e6369cbff37283db5a432
-rw-r--r--src/nvim/search.c10
-rw-r--r--src/nvim/version.c2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/search.c b/src/nvim/search.c
index 2dd0201259..c7a1ab3fb1 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -3140,10 +3140,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 487f3fc27b..72fafec7df 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,