aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.1.1407: popup_create() does not support text properties

Browse Source 
Problem:    Popup_create() does not support text properties.
Solution:   Support the third form of the text argument.
This commit is contained in:
Bram Moolenaar
2019-05-26 23:32:06 +02:00
parent 2cd0dce898
commit 7a8d0278bd
10 changed files with 162 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/screen.c
View File

@@ -4405,7 +4405,10 @@ win_line(
char_attr = hl_combine_attr(line_attr, search_attr);
# ifdef FEAT_TEXT_PROP
else if (text_prop_type != NULL)
char_attr = hl_combine_attr(line_attr, text_prop_attr);
{
char_attr = hl_combine_attr(
line_attr != 0 ? line_attr : win_attr, text_prop_attr);
}
# endif
else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL)
|| vcol < fromcol || vcol_prev < fromcol_prev
@@ -4429,7 +4432,8 @@ win_line(
char_attr = hl_combine_attr(
syntax_attr, text_prop_attr);
else
char_attr = text_prop_attr;
char_attr = hl_combine_attr(
win_attr, text_prop_attr);
}
else
#endif