aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ui.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 75af543448..27458d588b 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -194,15 +194,6 @@ void ui_refresh(void)
abort();
}
- if (!ui_active()) {
- return;
- }
-
- if (updating_screen) {
- ui_schedule_refresh();
- return;
- }
-
int width = INT_MAX;
int height = INT_MAX;
bool ext_widgets[kUIExtCount];
@@ -227,18 +218,29 @@ void ui_refresh(void)
if (i < kUIGlobalCount) {
ext_widgets[i] |= ui_cb_ext[i];
}
- // Set 'cmdheight' to zero when ext_messages becomes active.
+ // Set 'cmdheight' to zero when ext_messages becomes active for all tabpages.
if (i == kUIMessages && !ui_ext[i] && ext_widgets[i]) {
set_option_value(kOptCmdheight, NUMBER_OPTVAL(0), 0);
command_height();
+ FOR_ALL_TABS(tp) {
+ tp->tp_ch_used = 0;
+ }
}
ui_ext[i] = ext_widgets[i];
if (i < kUIGlobalCount) {
- ui_call_option_set(cstr_as_string(ui_ext_names[i]),
- BOOLEAN_OBJ(ext_widgets[i]));
+ ui_call_option_set(cstr_as_string(ui_ext_names[i]), BOOLEAN_OBJ(ext_widgets[i]));
}
}
+ if (!ui_active()) {
+ return;
+ }
+
+ if (updating_screen) {
+ ui_schedule_refresh();
+ return;
+ }
+
ui_default_colors_set();
int save_p_lz = p_lz;