mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-22 19:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let the highlight of listchars override cursorline

Browse Source 
Closes #3670
This commit is contained in:
Yichao Zhou
2016-05-11 19:16:07 -07:00
committed by Justin M. Keyes
parent 56cb1eb9f9
commit 33486c8ebd
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/nvim/screen.c
View File

@@ -3402,11 +3402,9 @@ win_line (
if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') { if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') {
c = lcs_trail; c = lcs_trail;
if (!attr_pri) { n_attr = 1;
n_attr = 1; extra_attr = hl_attr(HLF_8);
extra_attr = hl_attr(HLF_8); saved_attr2 = char_attr; /* save current attr */
saved_attr2 = char_attr; /* save current attr */
}
mb_c = c; mb_c = c;
if (enc_utf8 && (*mb_char2len)(c) > 1) { if (enc_utf8 && (*mb_char2len)(c) > 1) {
mb_utf8 = TRUE; mb_utf8 = TRUE;
@@ -3555,10 +3553,8 @@ win_line (
} }
lcs_eol_one = -1; lcs_eol_one = -1;
--ptr; /* put it back at the NUL */ --ptr; /* put it back at the NUL */
if (!attr_pri) { extra_attr = hl_attr(HLF_AT);
extra_attr = hl_attr(HLF_AT); n_attr = 1;
n_attr = 1;
}
mb_c = c; mb_c = c;
if (enc_utf8 && (*mb_char2len)(c) > 1) { if (enc_utf8 && (*mb_char2len)(c) > 1) {
mb_utf8 = TRUE; mb_utf8 = TRUE;
@@ -3587,11 +3583,9 @@ win_line (
n_extra = byte2cells(c) - 1; n_extra = byte2cells(c) - 1;
c = *p_extra++; c = *p_extra++;
} }
if (!attr_pri) { n_attr = n_extra + 1;
n_attr = n_extra + 1; extra_attr = hl_attr(HLF_8);
extra_attr = hl_attr(HLF_8); saved_attr2 = char_attr; /* save current attr */
saved_attr2 = char_attr; /* save current attr */
}
mb_utf8 = FALSE; /* don't draw as UTF-8 */ mb_utf8 = FALSE; /* don't draw as UTF-8 */
} else if (VIsual_active } else if (VIsual_active
&& (VIsual_mode == Ctrl_V && (VIsual_mode == Ctrl_V
@@ -3703,10 +3697,8 @@ win_line (
} }
/* Don't override visual selection highlighting. */ /* Don't override visual selection highlighting. */
if (n_attr > 0 if (n_attr > 0 && draw_state == WL_LINE)
&& draw_state == WL_LINE char_attr = hl_combine_attr(char_attr, extra_attr);
&& !attr_pri)
char_attr = extra_attr;
/* /*
* Handle the case where we are in column 0 but not on the first * Handle the case where we are in column 0 but not on the first