aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/mbyte.c
diff options
context:
space:
mode:
authorZviRackover <zvirack@gmail.com>2018-06-29 22:31:20 +0300
committerZviRackover <zvirack@gmail.com>2018-08-06 20:48:07 +0300
commit10b6afd652a896144d87fb0db4389001293e7973 (patch)
treed77eedbc08dd9d8038c31bdcdfbcacc974157e61 /src/nvim/mbyte.c
parent1593ee7cf21f77168531c959fa9e73933b502d2e (diff)
downloadrneovim-10b6afd652a896144d87fb0db4389001293e7973.tar.gz
rneovim-10b6afd652a896144d87fb0db4389001293e7973.tar.bz2
rneovim-10b6afd652a896144d87fb0db4389001293e7973.zip
Remove all occurences of the mb_ptr2char macro
First step towards implemening issue #7401. The same can be done for all deprecated mb_ functions in follow-up patches.
Diffstat (limited to 'src/nvim/mbyte.c')
-rw-r--r--src/nvim/mbyte.c6
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;
}