diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-08-08 01:24:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 01:24:18 +0200 |
| commit | c06613d2f6c3f3a864c43e03b95d12efb3e0f4a6 (patch) | |
| tree | 3d052800def8498c4d26887b881f99e40bb38a46 /src/nvim/mbyte.c | |
| parent | 1593ee7cf21f77168531c959fa9e73933b502d2e (diff) | |
| parent | 5cecd7a93aba83cd477519974fc33fadbdcfdc87 (diff) | |
| download | rneovim-c06613d2f6c3f3a864c43e03b95d12efb3e0f4a6.tar.gz rneovim-c06613d2f6c3f3a864c43e03b95d12efb3e0f4a6.tar.bz2 rneovim-c06613d2f6c3f3a864c43e03b95d12efb3e0f4a6.zip | |
Merge #8665 'Remove mb_ptr2char macro'
Diffstat (limited to 'src/nvim/mbyte.c')
| -rw-r--r-- | src/nvim/mbyte.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c index 65a1a8246c..7c196831ba 100644 --- a/src/nvim/mbyte.c +++ b/src/nvim/mbyte.c @@ -674,7 +674,7 @@ int mb_ptr2char_adv(const char_u **const pp) { int c; - c = (*mb_ptr2char)(*pp); + c = utf_ptr2char(*pp); *pp += (*mb_ptr2len)(*pp); return c; } @@ -687,7 +687,7 @@ int mb_cptr2char_adv(const char_u **pp) { int c; - c = (*mb_ptr2char)(*pp); + c = utf_ptr2char(*pp); *pp += utf_ptr2len(*pp); return c; } @@ -1714,7 +1714,7 @@ void mb_check_adjust_col(void *win_) // Reset `coladd` when the cursor would be on the right half of a // double-wide character. if (win->w_cursor.coladd == 1 && p[win->w_cursor.col] != TAB - && vim_isprintc((*mb_ptr2char)(p + win->w_cursor.col)) + && vim_isprintc(utf_ptr2char(p + win->w_cursor.col)) && ptr2cells(p + win->w_cursor.col) > 1) { win->w_cursor.coladd = 0; } |