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

Remove occurrences of 'has_mbyte' near lines changes by parent commit

Browse Source
This commit is contained in:
ZviRackover
2018-07-05 22:27:18 +03:00
parent 7046258a38
commit 7676fc7562
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/screen.c
View File

@@ -4242,14 +4242,13 @@ win_line (
* Don't do this for double-width characters. * Don't do this for double-width characters.
* Don't do this for a window not at the right screen border. * Don't do this for a window not at the right screen border.
*/ */
if (!(has_mbyte if (!(utf_off2cells(LineOffset[screen_row],
&& (utf_off2cells(LineOffset[screen_row],
LineOffset[screen_row] + screen_Columns) LineOffset[screen_row] + screen_Columns)
== 2 == 2
|| utf_off2cells(LineOffset[screen_row - 1] || utf_off2cells(LineOffset[screen_row - 1]
+ (int)Columns - 2, + (int)Columns - 2,
LineOffset[screen_row] + screen_Columns) LineOffset[screen_row] + screen_Columns)
== 2)) == 2)
) { ) {
ui_add_linewrap(screen_row-1); ui_add_linewrap(screen_row-1);
} }
@@ -4383,7 +4382,7 @@ static void screen_line(int row, int coloff, int endcol,
redraw_next = char_needs_redraw(off_from, off_to, endcol - col); redraw_next = char_needs_redraw(off_from, off_to, endcol - col);
while (col < endcol) { while (col < endcol) {
if (has_mbyte && (col + 1 < endcol)) if (col + 1 < endcol)
char_cells = utf_off2cells(off_from, max_off_from); char_cells = utf_off2cells(off_from, max_off_from);
else else
char_cells = 1; char_cells = 1;
@@ -4403,7 +4402,7 @@ static void screen_line(int row, int coloff, int endcol,
// the right halve of the old character. // the right halve of the old character.
// Also required when writing the right halve of a double-width // Also required when writing the right halve of a double-width
// char over the left halve of an existing one // char over the left halve of an existing one
if (has_mbyte && col + char_cells == endcol if (col + char_cells == endcol
&& ((char_cells == 1 && ((char_cells == 1
&& utf_off2cells(off_to, max_off_to) > 1) && utf_off2cells(off_to, max_off_to) > 1)
|| (char_cells == 2 || (char_cells == 2