mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-22 11:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Remove occurences of mb_char2bytes

Browse Source
This commit is contained in:
ZviRackover
2018-09-02 00:58:30 +03:00
parent 50eadfe2e9
commit cbdbc4f63d
17 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/screen.c
View File

@@ -3539,7 +3539,7 @@ win_line (
xfree(p_extra_free);
p_extra_free = p;
for (i = 0; i < tab_len; i++) {
mb_char2bytes(lcs_tab2, p);
utf_char2bytes(lcs_tab2, p);
p += mb_char2len(lcs_tab2);
n_extra += mb_char2len(lcs_tab2) - (saved_nextra > 0 ? 1: 0);
}
@@ -5120,7 +5120,7 @@ win_redr_custom (
/* fill up with "fillchar" */
while (width < maxwidth && len < (int)sizeof(buf) - 1) {
len += (*mb_char2bytes)(fillchar, buf + len);
len += utf_char2bytes(fillchar, buf + len);
++width;
}
buf[len] = NUL;
@@ -5229,7 +5229,7 @@ void screen_putchar(int c, int row, int col, int attr)
{
char_u buf[MB_MAXBYTES + 1];
buf[(*mb_char2bytes)(c, buf)] = NUL;
buf[utf_char2bytes(c, buf)] = NUL;
screen_puts(buf, row, col, attr);
}
@@ -6955,7 +6955,7 @@ static void win_redr_ruler(win_T *wp, int always)
// Need at least 3 chars left for get_rel_pos() + NUL.
while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) {
if (has_mbyte)
i += (*mb_char2bytes)(fillchar, buffer + i);
i += utf_char2bytes(fillchar, buffer + i);
else
buffer[i++] = fillchar;
++o;