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

Merge pull request #9629 from bfredl/pumfix

Browse Source 
screen: don't crash when drawing popupmenu with 'rightleft' option
This commit is contained in:
Björn Linse
2019-02-19 19:30:35 +01:00
committed by GitHub
parent f1843c0035 b98be54148
commit 46c7e12f27
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/screen.c
View File

@@ -5338,10 +5338,11 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr)
schar_from_ascii(ScreenLines[off - 1], ' '); schar_from_ascii(ScreenLines[off - 1], ' ');
ScreenAttrs[off - 1] = 0; ScreenAttrs[off - 1] = 0;
// redraw the previous cell, make it empty // redraw the previous cell, make it empty
if (put_dirty_first == -1) { if (put_dirty_first == -1 || col-1 < put_dirty_first) {
put_dirty_first = col-1; put_dirty_first = col-1;
} }
put_dirty_last = col+1; put_dirty_last = col+1;
put_dirty_last = MAX(put_dirty_last, col+1);
// force the cell at "col" to be redrawn // force the cell at "col" to be redrawn
force_redraw_next = true; force_redraw_next = true;
} }
@@ -5422,10 +5423,10 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr)
ScreenLines[off + 1][0] = 0; ScreenLines[off + 1][0] = 0;
ScreenAttrs[off + 1] = attr; ScreenAttrs[off + 1] = attr;
} }
if (put_dirty_first == -1) { if (put_dirty_first == -1 || col < put_dirty_first) {
put_dirty_first = col; put_dirty_first = col;
} }
put_dirty_last = col+mbyte_cells; put_dirty_last = MAX(put_dirty_last, col+mbyte_cells);
} }
off += mbyte_cells; off += mbyte_cells;