summaryrefslogtreecommitdiff
path: root/src/drawline.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-18 23:12:20 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-18 23:12:20 +0200
commit8459006af5e78bd0bd6dcfc6d54ddac35a91ee1c (patch)
treead84321d723ff6f4648987ae5da7d00946b10ed0 /src/drawline.c
parentc3bf7b56f2703e2d6f36dfb05fd32b5b43ce3c3f (diff)
downloadvim-git-8459006af5e78bd0bd6dcfc6d54ddac35a91ee1c.tar.gz
patch 8.1.2176: syntax attributes not combined with Visual highlightingv8.1.2176
Problem: Syntax attributes not combined with Visual highlighting. (Arseny Nasokin) Solution: Combine the attributes. (closes #5083)
Diffstat (limited to 'src/drawline.c')
-rw-r--r--src/drawline.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/drawline.c b/src/drawline.c
index 333eeba29..ef3b69f8c 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1470,9 +1470,21 @@ win_line(
attr_pri = TRUE;
#ifdef LINE_ATTR
if (area_attr != 0)
+ {
char_attr = hl_combine_attr(line_attr, area_attr);
+# ifdef FEAT_SYN_HL
+ if (syntax_attr != 0)
+ char_attr = hl_combine_attr(syntax_attr, char_attr);
+# endif
+ }
else if (search_attr != 0)
+ {
char_attr = hl_combine_attr(line_attr, search_attr);
+# ifdef FEAT_SYN_HL
+ if (syntax_attr != 0)
+ char_attr = hl_combine_attr(syntax_attr, char_attr);
+# endif
+ }
# ifdef FEAT_TEXT_PROP
else if (text_prop_type != NULL)
{