patch 8.1.1518: crash when setting 'columns' while a popup is visible
Problem: Crash when setting 'columns' while a popup is visible.
Solution: Recompute all positions when clearing the screen. (closes #4467)
diff --git a/src/screen.c b/src/screen.c
index 1ffc729..644829e 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1029,9 +1029,16 @@
win_T *wp;
short *mask;
int line, col;
+ int redraw_all = FALSE;
- if (popup_mask_tab != curtab)
+ // Need to recompute when switching tabs.
+ // Also recompute when the type is CLEAR or NOT_VALID, something basic
+ // (such as the screen size) must have changed.
+ if (popup_mask_tab != curtab || type >= NOT_VALID)
+ {
popup_mask_refresh = TRUE;
+ redraw_all = TRUE;
+ }
if (!popup_mask_refresh)
{
// Check if any buffer has changed.
@@ -1070,7 +1077,8 @@
popup_visible = TRUE;
// Recompute the position if the text changed.
- if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer))
+ if (redraw_all
+ || wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer))
popup_adjust_position(wp);
// the width and height are for the inside, add the padding and