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

terminal: swap priority of terminal, editor highlights

Browse Source 
closes #9964
This commit is contained in:
Justin M. Keyes
2019-05-02 09:56:22 +02:00
parent 49c51f839b
commit fd0fd752c8
6 changed files with 90 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/screen.c
View File

@@ -3275,16 +3275,18 @@ win_line (
line = ml_get_buf(wp->w_buffer, lnum, FALSE);
ptr = line + v;
if (!attr_pri)
if (!attr_pri) {
char_attr = syntax_attr;
else
} else {
char_attr = hl_combine_attr(syntax_attr, char_attr);
/* no concealing past the end of the line, it interferes
* with line highlighting */
if (c == NUL)
}
// no concealing past the end of the line, it interferes
// with line highlighting.
if (c == NUL) {
syntax_flags = 0;
else
} else {
syntax_flags = get_syntax_info(&syntax_seqnr);
}
} else if (!attr_pri) {
char_attr = 0;
}
@@ -3376,7 +3378,7 @@ win_line (
}
if (wp->w_buffer->terminal) {
char_attr = hl_combine_attr(char_attr, term_attrs[vcol]);
char_attr = hl_combine_attr(term_attrs[vcol], char_attr);
}
// Found last space before word: check for line break.