patch 8.1.2386: 'wincolor' is not used for 'listchars'
Problem: 'wincolor' is not used for 'listchars'.
Solution: Combine the colors. (closes #5308)
diff --git a/src/drawline.c b/src/drawline.c
index cb1c401..3e8b8b9 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -1222,7 +1222,6 @@
c_extra = NUL;
c_final = NUL;
n_extra = (int)STRLEN(sbr);
- char_attr = HL_ATTR(HLF_AT);
need_showbreak = FALSE;
vcol_sbr = vcol + MB_CHARLEN(sbr);
// Correct end of highlighted area for 'showbreak',
@@ -1230,7 +1229,7 @@
if (tocol == vcol)
tocol += n_extra;
// combine 'showbreak' with 'wincolor'
- char_attr = hl_combine_attr(win_attr, char_attr);
+ char_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_AT));
# ifdef FEAT_SYN_HL
// combine 'showbreak' with 'cursorline'
if (cul_attr != 0)
@@ -1701,7 +1700,8 @@
if (area_attr == 0 && search_attr == 0)
{
n_attr = n_extra + 1;
- extra_attr = HL_ATTR(HLF_8);
+ extra_attr = hl_combine_attr(
+ win_attr, HL_ATTR(HLF_8));
saved_attr2 = char_attr; // save current attr
}
}
@@ -1770,7 +1770,8 @@
if (area_attr == 0 && search_attr == 0)
{
n_attr = n_extra + 1;
- extra_attr = HL_ATTR(HLF_8);
+ extra_attr = hl_combine_attr(
+ win_attr, HL_ATTR(HLF_8));
saved_attr2 = char_attr; // save current attr
}
mb_c = c;
@@ -1814,7 +1815,7 @@
if (area_attr == 0 && search_attr == 0)
{
n_attr = n_extra + 1;
- extra_attr = HL_ATTR(HLF_AT);
+ extra_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_AT));
saved_attr2 = char_attr; // save current attr
}
mb_c = c;
@@ -1969,7 +1970,7 @@
if (area_attr == 0 && search_attr == 0)
{
n_attr = 1;
- extra_attr = HL_ATTR(HLF_8);
+ extra_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_8));
saved_attr2 = char_attr; // save current attr
}
mb_c = c;
@@ -1989,7 +1990,7 @@
if (!attr_pri)
{
n_attr = 1;
- extra_attr = HL_ATTR(HLF_8);
+ extra_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_8));
saved_attr2 = char_attr; // save current attr
}
mb_c = c;
@@ -2127,7 +2128,7 @@
c_extra = lcs_tab2;
c_final = lcs_tab3;
n_attr = tab_len + 1;
- extra_attr = HL_ATTR(HLF_8);
+ extra_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_8));
saved_attr2 = char_attr; // save current attr
mb_c = c;
if (enc_utf8 && utf_char2len(c) > 1)
@@ -2198,7 +2199,7 @@
--ptr; // put it back at the NUL
if (!attr_pri)
{
- extra_attr = HL_ATTR(HLF_AT);
+ extra_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_AT));
n_attr = 1;
}
mb_c = c;
@@ -2244,7 +2245,7 @@
if (!attr_pri)
{
n_attr = n_extra + 1;
- extra_attr = HL_ATTR(HLF_8);
+ extra_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_8));
saved_attr2 = char_attr; // save current attr
}
mb_utf8 = FALSE; // don't draw as UTF-8
@@ -2503,7 +2504,7 @@
c_final = NUL;
n_extra = 1;
n_attr = 2;
- extra_attr = HL_ATTR(HLF_AT);
+ extra_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_AT));
}
mb_c = c;
if (enc_utf8 && utf_char2len(c) > 1)
@@ -2517,7 +2518,7 @@
if (!attr_pri)
{
saved_attr3 = char_attr; // save current attr
- char_attr = HL_ATTR(HLF_AT); // later copied to char_attr
+ char_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_AT));
n_attr3 = 1;
}
}
@@ -2725,7 +2726,7 @@
|| (n_extra && (c_extra != NUL || *p_extra != NUL))))
{
c = lcs_ext;
- char_attr = HL_ATTR(HLF_AT);
+ char_attr = hl_combine_attr(win_attr, HL_ATTR(HLF_AT));
mb_c = c;
if (enc_utf8 && utf_char2len(c) > 1)
{