aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-05-24 13:01:30 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-05-24 13:13:00 -0400
commit529d88c64164f69e8005192f75e392640c941b9f (patch)
tree7003d8dae6ce0e94dc1ef4aa2b2aaac868be0cf0 /src/nvim/screen.c
parentdb3136d2eac607514ca76a6e4defc33dedd1539d (diff)
downloadrneovim-529d88c64164f69e8005192f75e392640c941b9f.tar.gz
rneovim-529d88c64164f69e8005192f75e392640c941b9f.tar.bz2
rneovim-529d88c64164f69e8005192f75e392640c941b9f.zip
vim-patch:8.2.1689: 'colorcolumn' doesn't show in indent
Problem: 'colorcolumn' doesn't show in indent. Solution: Also draw the column when draw_state is WL_BRI or WL_SBR. (Alexey Demin, closes vim/vim#6948, closes vim/vim#6619) https://github.com/vim/vim/commit/ad5e5631c5dc93a50bbe637be254c5e9968848ea
Diffstat (limited to 'src/nvim/screen.c')
-rw-r--r--src/nvim/screen.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index c40211bcb6..90ac4ac7aa 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -4138,8 +4138,12 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
// highlight the cursor position itself.
// Also highlight the 'colorcolumn' if it is different than
// 'cursorcolumn'
+ // Also highlight the 'colorcolumn' if 'breakindent' and/or 'showbreak'
+ // options are set
vcol_save_attr = -1;
- if (draw_state == WL_LINE
+ if ((draw_state == WL_LINE
+ || draw_state == WL_BRI
+ || draw_state == WL_SBR)
&& !lnum_in_visual_area
&& search_attr == 0
&& area_attr == 0