aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/message.c
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2019-09-02 10:46:24 +0200
committerBjörn Linse <bjorn.linse@gmail.com>2019-09-02 12:39:03 +0200
commit66f4e8aee0bb810342364eaf6c9486918cbf1f17 (patch)
tree028e65927ae113a042e2c8a40a9fcc7dfcc73bc3 /src/nvim/message.c
parent099445cc07b0154edc6ecd562a28e86c87c0096b (diff)
downloadrneovim-66f4e8aee0bb810342364eaf6c9486918cbf1f17.tar.gz
rneovim-66f4e8aee0bb810342364eaf6c9486918cbf1f17.tar.bz2
rneovim-66f4e8aee0bb810342364eaf6c9486918cbf1f17.zip
screen: initialize screen properly with early `set display-=msgsep`
Currently `nvim -u NORC --cmd "set display-=msgsep"` will still allocate the message grid and remove it just afterwards. While inefficient, we must make sure update_screen() re-validates the default_grid completely when this happens. Fix some invalid logic: don't reallocate msg_grid on resize when the grid is not used. Elide a too early ui_flush() on startup, which caused an invalid cursor position to be used.
Diffstat (limited to 'src/nvim/message.c')
-rw-r--r--src/nvim/message.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 2354cce2b7..ac731210d7 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -154,8 +154,8 @@ void msg_grid_validate(void)
{
grid_assign_handle(&msg_grid);
bool should_alloc = msg_dothrottle();
- if (msg_grid.Rows != Rows || msg_grid.Columns != Columns
- || (should_alloc && !msg_grid.chars)) {
+ if (should_alloc && (msg_grid.Rows != Rows || msg_grid.Columns != Columns
+ || !msg_grid.chars)) {
// TODO(bfredl): eventually should be set to "invalid". I e all callers
// will use the grid including clear to EOS if necessary.
grid_alloc(&msg_grid, Rows, Columns, false, true);