diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-09-06 20:28:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-06 20:28:26 +0200 |
| commit | fd4636f1b920d0063f8fbe4cfa1695f9fd46971f (patch) | |
| tree | 75945d6ae51bfe2732e2b578cb5bb37381e94899 /src/nvim/screen.c | |
| parent | fd8b00bacd2cde1e7aa0543acf58b1a7344f8daf (diff) | |
| parent | 837f31c0b48f1f8f859cab575b65d914c98b5e13 (diff) | |
| download | rneovim-fd4636f1b920d0063f8fbe4cfa1695f9fd46971f.tar.gz rneovim-fd4636f1b920d0063f8fbe4cfa1695f9fd46971f.tar.bz2 rneovim-fd4636f1b920d0063f8fbe4cfa1695f9fd46971f.zip | |
Merge pull request #10930 from bfredl/pagerthrottle
fixes for pager glitches and crashes
Diffstat (limited to 'src/nvim/screen.c')
| -rw-r--r-- | src/nvim/screen.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 13eb088813..5bcd2c808d 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -404,7 +404,9 @@ int update_screen(int type) default_grid.valid = true; } - if (type == NOT_VALID && (msg_dothrottle() || msg_grid.chars)) { + // After disabling msgsep the grid might not have been deallocated yet, + // hence we also need to check msg_grid.chars + if (type == NOT_VALID && (msg_use_grid() || msg_grid.chars)) { grid_fill(&default_grid, Rows-p_ch, Rows, 0, Columns, ' ', ' ', 0); } @@ -6250,7 +6252,7 @@ void screenclear(void) msg_scrolled = 0; // can't scroll back msg_didany = false; msg_didout = false; - if (HL_ATTR(HLF_MSG) > 0 && msg_dothrottle() && msg_grid.chars) { + if (HL_ATTR(HLF_MSG) > 0 && msg_use_grid() && msg_grid.chars) { grid_invalidate(&msg_grid); msg_grid_validate(); msg_grid_invalid = false; |