commit 6d585f4c5c8d120f768dd61bfd32f6e57ad562a7
author Bram Moolenaar <Bram@vim.org> Sun Jul 26 22:20:54 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Jul 26 22:20:54 2020 +0200
tree 47e0cb1bbc2f7aa9b223584994afd45a5b68869d
parent 01865ade85d2508639e24aaca5948b09fb284a82

patch 8.2.1303: calling popup_setoptions() resets 'signcolumn'

Problem:    Calling popup_setoptions() resets 'signcolumn'.
Solution:   Only set 'signcolumn' when creating the popup. (closes #6542)

src/popupwin.c

diff --git a/src/popupwin.c b/src/popupwin.c
index fc69c90..d2b7f22 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -740,8 +740,6 @@
 	set_string_option_direct_in_win(wp, (char_u *)"wincolor", -1,
 						   str, OPT_FREE|OPT_LOCAL, 0);
 
-    set_string_option_direct_in_win(wp, (char_u *)"signcolumn", -1,
-					(char_u *)"no", OPT_FREE|OPT_LOCAL, 0);
     set_padding_border(dict, wp->w_popup_padding, "padding", 999);
     set_padding_border(dict, wp->w_popup_border, "border", 1);
 
@@ -946,6 +944,10 @@
     int		nr;
 
     apply_move_options(wp, dict);
+
+    set_string_option_direct_in_win(wp, (char_u *)"signcolumn", -1,
+					(char_u *)"no", OPT_FREE|OPT_LOCAL, 0);
+
     apply_general_options(wp, dict);
 
     nr = dict_get_number(dict, (char_u *)"hidden");