diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-08-28 23:37:30 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-08-28 23:37:30 +0200 |
| commit | a2403a0ed9afdfaea7abb5555dbdf555b56eff9a (patch) | |
| tree | 74378ce589d267842f018955bbf9daf93bedac13 /src/nvim/getchar.c | |
| parent | acdede50cebf7d247e55356be828ebaba43c0d3d (diff) | |
| parent | d110c6d7907d6f27f32b1d2bd91ffee7ef6097f4 (diff) | |
| download | rneovim-a2403a0ed9afdfaea7abb5555dbdf555b56eff9a.tar.gz rneovim-a2403a0ed9afdfaea7abb5555dbdf555b56eff9a.tar.bz2 rneovim-a2403a0ed9afdfaea7abb5555dbdf555b56eff9a.zip | |
Merge #8863 'refactor: Remove mb_head_off() '
Diffstat (limited to 'src/nvim/getchar.c')
| -rw-r--r-- | src/nvim/getchar.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index b57e1f6558..0379b1cadb 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -2129,13 +2129,14 @@ static int vgetorpeek(int advance) curwin->w_wcol = curwin->w_width - 1; col = curwin->w_cursor.col - 1; } - if (has_mbyte && col > 0 && curwin->w_wcol > 0) { - /* Correct when the cursor is on the right halve - * of a double-wide character. */ + if (col > 0 && curwin->w_wcol > 0) { + // Correct when the cursor is on the right halve + // of a double-wide character. ptr = get_cursor_line_ptr(); - col -= (*mb_head_off)(ptr, ptr + col); - if ((*mb_ptr2cells)(ptr + col) > 1) - --curwin->w_wcol; + col -= utf_head_off(ptr, ptr + col); + if (utf_ptr2cells(ptr + col) > 1) { + curwin->w_wcol--; + } } } setcursor(); |