mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 23:38:17 +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

10
src/nvim/ex_getln.c
View File

@@ -1763,7 +1763,7 @@ static int command_line_handle_key(CommandLineState *s)
put_on_cmdline(get_special_key_name(s->c, mod_mask), -1, true);
} else {
if (has_mbyte) {
s->j = (*mb_char2bytes)(s->c, IObuff);
s->j = utf_char2bytes(s->c, IObuff);
IObuff[s->j] = NUL; // exclude composing chars
put_on_cmdline(IObuff, s->j, true);
} else {
@@ -2373,7 +2373,7 @@ redraw:
c1 = '?';
}
if (has_mbyte) {
len = (*mb_char2bytes)(c1, (char_u *)line_ga.ga_data + line_ga.ga_len);
len = utf_char2bytes(c1, (char_u *)line_ga.ga_data + line_ga.ga_len);
} else {
len = 1;
((char_u *)line_ga.ga_data)[line_ga.ga_len] = c1;
@@ -2897,11 +2897,11 @@ static void draw_cmdline(int start, int len)
u8c = arabic_shape(u8c, NULL, &u8cc[0], pc, pc1, nc);
newlen += (*mb_char2bytes)(u8c, arshape_buf + newlen);
newlen += utf_char2bytes(u8c, arshape_buf + newlen);
if (u8cc[0] != 0) {
newlen += (*mb_char2bytes)(u8cc[0], arshape_buf + newlen);
newlen += utf_char2bytes(u8cc[0], arshape_buf + newlen);
if (u8cc[1] != 0)
newlen += (*mb_char2bytes)(u8cc[1],
newlen += utf_char2bytes(u8cc[1],
arshape_buf + newlen);
}
} else {