mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-17 16:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove has_mbytes local to lines changed in parent commit

Browse Source
This commit is contained in:
ZviRackover
2018-09-02 01:36:18 +03:00
parent cbdbc4f63d
commit ac13e65ae0
11 changed files with 51 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/ex_getln.c
View File

@@ -1762,14 +1762,10 @@ static int command_line_handle_key(CommandLineState *s)
if (IS_SPECIAL(s->c) || mod_mask != 0) {
put_on_cmdline(get_special_key_name(s->c, mod_mask), -1, true);
} else {
if (has_mbyte) {
s->j = utf_char2bytes(s->c, IObuff);
IObuff[s->j] = NUL; // exclude composing chars
put_on_cmdline(IObuff, s->j, true);
} else {
IObuff[0] = s->c;
put_on_cmdline(IObuff, 1, true);
}
s->j = utf_char2bytes(s->c, IObuff);
IObuff[s->j] = NUL; // exclude composing chars
put_on_cmdline(IObuff, s->j, true);
}
return command_line_changed(s);
}
@@ -2372,12 +2368,7 @@ redraw:
if (IS_SPECIAL(c1)) {
c1 = '?';
}
if (has_mbyte) {
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;
}
len = utf_char2bytes(c1, (char_u *)line_ga.ga_data + line_ga.ga_len);
if (c1 == '\n')
msg_putchar('\n');
else if (c1 == TAB) {