mirror of
https://github.com/neovim/neovim.git
synced 2024-12-23 20:55:18 -07:00
screen.c: fix last character on foldtext
Last character on a folded line was sometimes highlighted with the "Search" highlight. Solves this along with some remaining "curwin".
This commit is contained in:
parent
2ea3127697
commit
b419e39a2a
@ -2417,8 +2417,8 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
|
||||
}
|
||||
}
|
||||
|
||||
if (wp->w_p_list) {
|
||||
if (curwin->w_p_lcs_chars.space
|
||||
if (wp->w_p_list && !has_fold) {
|
||||
if (wp->w_p_lcs_chars.space
|
||||
|| wp->w_p_lcs_chars.trail
|
||||
|| wp->w_p_lcs_chars.nbsp) {
|
||||
extra_check = true;
|
||||
@ -2883,8 +2883,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
|
||||
}
|
||||
|
||||
if (draw_state == WL_LINE
|
||||
&& foldinfo.fi_level != 0
|
||||
&& foldinfo.fi_lines > 0
|
||||
&& has_fold
|
||||
&& vcol == 0
|
||||
&& n_extra == 0
|
||||
&& row == startrow) {
|
||||
@ -2905,8 +2904,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
|
||||
}
|
||||
|
||||
if (draw_state == WL_LINE
|
||||
&& foldinfo.fi_level != 0
|
||||
&& foldinfo.fi_lines > 0
|
||||
&& has_fold
|
||||
&& col < grid->Columns
|
||||
&& n_extra == 0
|
||||
&& row == startrow) {
|
||||
@ -2918,8 +2916,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
|
||||
}
|
||||
|
||||
if (draw_state == WL_LINE
|
||||
&& foldinfo.fi_level != 0
|
||||
&& foldinfo.fi_lines > 0
|
||||
&& has_fold
|
||||
&& col >= grid->Columns
|
||||
&& n_extra != 0
|
||||
&& row == startrow) {
|
||||
@ -3087,7 +3084,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
|
||||
|| vcol < fromcol || vcol_prev < fromcol_prev
|
||||
|| vcol >= tocol)) {
|
||||
char_attr = line_attr;
|
||||
} else {
|
||||
} else {
|
||||
attr_pri = false;
|
||||
if (has_syntax) {
|
||||
char_attr = syntax_attr;
|
||||
@ -3742,7 +3739,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
|
||||
}
|
||||
wp->w_wrow = row;
|
||||
did_wcol = true;
|
||||
curwin->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL;
|
||||
wp->w_valid |= VALID_WCOL|VALID_WROW|VALID_VIRTCOL;
|
||||
}
|
||||
|
||||
// Don't override visual selection highlighting.
|
||||
@ -3835,9 +3832,9 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
|
||||
// Add a blank character to highlight.
|
||||
schar_from_ascii(linebuf_char[off], ' ');
|
||||
}
|
||||
if (area_attr == 0) {
|
||||
/* Use attributes from match with highest priority among
|
||||
* 'search_hl' and the match list. */
|
||||
if (area_attr == 0 && !has_fold) {
|
||||
// Use attributes from match with highest priority among
|
||||
// 'search_hl' and the match list.
|
||||
char_attr = search_hl.attr;
|
||||
cur = wp->w_match_head;
|
||||
shl_flag = FALSE;
|
||||
|
Loading…
Reference in New Issue
Block a user