aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.1303: calling popup_setoptions() resets 'signcolumn'

Browse Source 
Problem:    Calling popup_setoptions() resets 'signcolumn'.
Solution:   Only set 'signcolumn' when creating the popup. (closes #6542)
This commit is contained in:
Bram Moolenaar
2020-07-26 22:20:54 +02:00
parent 01865ade85
commit 6d585f4c5c
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/popupwin.c
View File

@@ -740,8 +740,6 @@ apply_general_options(win_T *wp, dict_T *dict)
set_string_option_direct_in_win(wp, (char_u *)"wincolor", -1, set_string_option_direct_in_win(wp, (char_u *)"wincolor", -1,
str, OPT_FREE|OPT_LOCAL, 0); 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_padding, "padding", 999);
set_padding_border(dict, wp->w_popup_border, "border", 1); set_padding_border(dict, wp->w_popup_border, "border", 1);
@@ -946,6 +944,10 @@ apply_options(win_T *wp, dict_T *dict)
int nr; int nr;
apply_move_options(wp, dict); 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); apply_general_options(wp, dict);
nr = dict_get_number(dict, (char_u *)"hidden"); nr = dict_get_number(dict, (char_u *)"hidden");

10
src/testdir/test_popupwin.vim
View File

@@ -3115,6 +3115,11 @@ func Test_popupmenu_info_border()
call term_sendkeys(buf, "a\<C-X>\<C-U>") call term_sendkeys(buf, "a\<C-X>\<C-U>")
call VerifyScreenDump(buf, 'Test_popupwin_infopopup_8', {}) call VerifyScreenDump(buf, 'Test_popupwin_infopopup_8', {})
call term_sendkeys(buf, " \<Esc>")
call term_sendkeys(buf, ":set completepopup+=width:10\<CR>")
call term_sendkeys(buf, "a\<C-X>\<C-U>")
call VerifyScreenDump(buf, 'Test_popupwin_infopopup_9', {})
call term_sendkeys(buf, "\<Esc>") call term_sendkeys(buf, "\<Esc>")
call StopVimInTerminal(buf) call StopVimInTerminal(buf)
call delete('XtestInfoPopup') call delete('XtestInfoPopup')
@@ -3436,6 +3441,11 @@ func Test_popupwin_atcursor_far_right()
normal! ggg$ normal! ggg$
let winid = popup_atcursor(repeat('x', 500), #{moved: 'any', border: []}) let winid = popup_atcursor(repeat('x', 500), #{moved: 'any', border: []})
" 'signcolumn' was getting reset
call setwinvar(winid, '&signcolumn', 'yes')
call popup_setoptions(winid, {'zindex': 1000})
call assert_equal('yes', getwinvar(winid, '&signcolumn'))
call popup_close(winid) call popup_close(winid)
bwipe! bwipe!
set signcolumn& set signcolumn&

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1303,
/**/ /**/
1302, 1302,
/**/ /**/