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.1.2307: positioning popup doesn't work for buffer-local textprop

Browse Source 
Problem:    Positioning popup doesn't work for buffer-local textprop.
Solution:   Make it work. (closes #5225)
This commit is contained in:
Bram Moolenaar
2019-11-16 20:03:31 +01:00
parent f36a2c7e60
commit a37cb55da6
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/popupwin.c
View File

@@ -452,24 +452,22 @@ apply_move_options(win_T *wp, dict_T *d)
wp->w_popup_prop_type = 0;
if (*str != NUL)
{
nr = find_prop_type_id(str, wp->w_buffer);
wp->w_popup_prop_win = curwin;
di = dict_find(d, (char_u *)"textpropwin", -1);
if (di != NULL)
{
wp->w_popup_prop_win = find_win_by_nr_or_id(&di->di_tv);
if (!win_valid(wp->w_popup_prop_win))
wp->w_popup_prop_win = curwin;
}
nr = find_prop_type_id(str, wp->w_popup_prop_win->w_buffer);
if (nr <= 0)
nr = find_prop_type_id(str, NULL);
if (nr <= 0)
semsg(_(e_invarg2), str);
else
{
wp->w_popup_prop_type = nr;
wp->w_popup_prop_win = curwin;
di = dict_find(d, (char_u *)"textpropwin", -1);
if (di != NULL)
{
wp->w_popup_prop_win = find_win_by_nr_or_id(&di->di_tv);
if (win_valid(wp->w_popup_prop_win))
wp->w_popup_prop_win = curwin;
}
}
}
}