summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-15 18:11:16 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-15 18:11:16 +0200
commit8ae54375cad51c3c05b7bb5600305062a1ebad1c (patch)
treeb969d92ba8f239b200909bf676bbe9da9c3f6057 /src/screen.c
parentaf9143833865a2d8311e57313023271720442f90 (diff)
downloadvim-git-8ae54375cad51c3c05b7bb5600305062a1ebad1c.tar.gz
patch 8.1.2039: character from 'showbreak' does not use 'wincolor'v8.1.2039
Problem: Character from 'showbreak' does not use 'wincolor'. (Nick Jensen) Solution: Mix with 'wincolor'. (closes #4938)
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c
index 14b946538..22b26b472 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4153,6 +4153,9 @@ win_line(
* required when 'linebreak' is also set. */
if (tocol == vcol)
tocol += n_extra;
+ // combine 'showbreak' with 'wincolor'
+ if (win_attr != 0)
+ char_attr = hl_combine_attr(win_attr, char_attr);
# ifdef FEAT_SYN_HL
// combine 'showbreak' with 'cursorline'
if (cul_attr != 0)