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/ops.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/ops.c')
| -rw-r--r-- | src/nvim/ops.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 4fb1a1ea9d..041443d472 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 == ' ') @@ -3639,18 +3639,12 @@ int do_join(size_t count, sumsize += currsize + spaces[t]; endcurr1 = endcurr2 = NUL; if (insert_space && currsize > 0) { - if (has_mbyte) { - cend = curr + currsize; + cend = curr + currsize; + MB_PTR_BACK(curr, cend); + endcurr1 = utf_ptr2char(cend); + if (cend > curr) { MB_PTR_BACK(curr, cend); - endcurr1 = (*mb_ptr2char)(cend); - if (cend > curr) { - MB_PTR_BACK(curr, cend); - endcurr2 = (*mb_ptr2char)(cend); - } - } else { - endcurr1 = *(curr + currsize - 1); - if (currsize > 1) - endcurr2 = *(curr + currsize - 2); + endcurr2 = utf_ptr2char(cend); } } line_breakcheck(); |