diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-09-23 22:17:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-09-23 22:17:15 +0200 |
| commit | 053f712ef20d143818aa07275cf1f4fa55afbf85 (patch) | |
| tree | 2c592bc982525beeb6b1eb8d89461fa8088ff955 /src/drawline.c | |
| parent | b8ff5c271ee5dcef6f63436b77e228e062ff9a0e (diff) | |
| download | vim-git-053f712ef20d143818aa07275cf1f4fa55afbf85.tar.gz | |
patch 8.1.2071: when 'wincolor' is set text property changes highlightingv8.1.2071
Problem: When 'wincolor' is set text property changes highlighting. (Andy
Stewart)
Solution: Fix combining colors. (closes #4968)
Diffstat (limited to 'src/drawline.c')
| -rw-r--r-- | src/drawline.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/drawline.c b/src/drawline.c index 5916458be..43604c826 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -1367,6 +1367,7 @@ win_line( text_prop_attr = 0; text_prop_combine = FALSE; + text_prop_type = NULL; if (text_props_active > 0) { // Sort the properties on priority and/or starting last. @@ -1406,8 +1407,11 @@ win_line( # ifdef FEAT_TEXT_PROP else if (text_prop_type != NULL) { - char_attr = hl_combine_attr( - line_attr != 0 ? line_attr : win_attr, text_prop_attr); + char_attr = hl_combine_attr(line_attr != 0 + ? line_attr + : syntax_attr != 0 + ? syntax_attr + : win_attr, text_prop_attr); } # endif else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |