Mercurial > vim
diff src/drawline.c @ 18152:1acc94f17906 v8.1.2071
patch 8.1.2071: when 'wincolor' is set text property changes highlighting
Commit: https://github.com/vim/vim/commit/053f712ef20d143818aa07275cf1f4fa55afbf85
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Sep 23 22:17:15 2019 +0200
patch 8.1.2071: when 'wincolor' is set text property changes highlighting
Problem: When 'wincolor' is set text property changes highlighting. (Andy
Stewart)
Solution: Fix combining colors. (closes #4968)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 23 Sep 2019 22:30:03 +0200 |
| parents | 851a014dfd8b |
| children | 1f5571e7f012 |
line wrap: on
line diff
--- 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)