Mercurial > vim

diff src/screen.c @ 17037:9297877074a3 v8.1.1518

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1518: crash when setting 'columns' while a popup is visible commit https://github.com/vim/vim/commit/202d982b36d87cf91d992bd7e30d3223bdc72cd9 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jun 11 21:56:30 2019 +0200 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 https://github.com/vim/vim/issues/4467)
author Bram Moolenaar <Bram@vim.org>
date Tue, 11 Jun 2019 22:00:07 +0200
parents d4a7c690c8e6
children 5ed4965ebc7b
line wrap: on
line diff
--- a/src/screen.c
+++ b/src/screen.c
@@ -1029,9 +1029,16 @@ may_update_popup_mask(int type)
     win_T	*wp;
     short	*mask;
     int		line, col;
-
-    if (popup_mask_tab != curtab)
+    int		redraw_all = FALSE;
+
+    // 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 @@ may_update_popup_mask(int type)
 	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