diff options
| author | ZviRackover <zvirack@gmail.com> | 2018-06-29 22:31:20 +0300 |
|---|---|---|
| committer | ZviRackover <zvirack@gmail.com> | 2018-08-06 20:48:07 +0300 |
| commit | 10b6afd652a896144d87fb0db4389001293e7973 (patch) | |
| tree | d77eedbc08dd9d8038c31bdcdfbcacc974157e61 /src/nvim/ops.c | |
| parent | 1593ee7cf21f77168531c959fa9e73933b502d2e (diff) | |
| download | rneovim-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/ops.c')
| -rw-r--r-- | src/nvim/ops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 4fb1a1ea9d..05955f4215 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -3620,9 +3620,9 @@ int do_join(size_t count, curr = skipwhite(curr); if (*curr != ')' && currsize != 0 && endcurr1 != TAB && (!has_format_option(FO_MBYTE_JOIN) - || (mb_ptr2char(curr) < 0x100 && endcurr1 < 0x100)) + || (utf_ptr2char(curr) < 0x100 && endcurr1 < 0x100)) && (!has_format_option(FO_MBYTE_JOIN2) - || mb_ptr2char(curr) < 0x100 || endcurr1 < 0x100) + || utf_ptr2char(curr) < 0x100 || endcurr1 < 0x100) ) { /* don't add a space if the line is ending in a space */ if (endcurr1 == ' ') @@ -3642,10 +3642,10 @@ int do_join(size_t count, if (has_mbyte) { cend = curr + currsize; MB_PTR_BACK(curr, cend); - endcurr1 = (*mb_ptr2char)(cend); + endcurr1 = utf_ptr2char(cend); if (cend > curr) { MB_PTR_BACK(curr, cend); - endcurr2 = (*mb_ptr2char)(cend); + endcurr2 = utf_ptr2char(cend); } } else { endcurr1 = *(curr + currsize - 1); |