Mercurial > vim
diff src/screen.c @ 16811:0457d49eb2d9 v8.1.1407
patch 8.1.1407: popup_create() does not support text properties
commit https://github.com/vim/vim/commit/7a8d0278bd6bd57e04f61183cb8e2969cf148e3f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 26 23:32:06 2019 +0200
patch 8.1.1407: popup_create() does not support text properties
Problem: Popup_create() does not support text properties.
Solution: Support the third form of the text argument.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 26 May 2019 23:45:05 +0200 |
parents | 5ff14f96f1c9 |
children | 4cfad94161f4 |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -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