IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

message: Some more has_mbyte/enc_utf8 removal

Browse Source
This commit is contained in:
ZyX 2017-04-16 20:58:19 +03:00
parent 083792e137
commit 0718d0e6d4
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/message.c
View File

@ -1657,16 +1657,13 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr,
// Display char in last column before showing more-prompt. // Display char in last column before showing more-prompt.
if (*s >= ' ' && !cmdmsg_rl) { if (*s >= ' ' && !cmdmsg_rl) {
if (has_mbyte) { if (maxlen >= 0) {
if (enc_utf8 && maxlen >= 0) // Avoid including composing chars after the end.
/* avoid including composing chars after the end */
l = utfc_ptr2len_len(s, (int)((str + maxlen) - s)); l = utfc_ptr2len_len(s, (int)((str + maxlen) - s));
else
l = (*mb_ptr2len)(s);
s = screen_puts_mbyte((char_u *)s, l, attr);
} else { } else {
msg_screen_putchar(*s++, attr); l = utfc_ptr2len(s);
} }
s = screen_puts_mbyte((char_u *)s, l, attr);
did_last_char = true; did_last_char = true;
} else { } else {
did_last_char = false; did_last_char = false;