thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0945: failures in the cursorline test

Browse Source 
Problem:    Failures in the cursorline test.
Solution:   Reset extra_attr only after a text property.
This commit is contained in:
Bram Moolenaar
2022-11-24 23:04:02 +00:00
parent 6ac16f0c0f
commit 637862fc3c
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/drawline.c
View File

@@ -2403,9 +2403,6 @@ win_line(
#if defined(FEAT_PROP_POPUP) #if defined(FEAT_PROP_POPUP)
if (wlv.n_extra <= 0) if (wlv.n_extra <= 0)
{ {
wlv.extra_for_textprop = FALSE;
in_linebreak = FALSE;
// Only restore search_attr and area_attr after "n_extra" in // Only restore search_attr and area_attr after "n_extra" in
// the next screen line is also done. // the next screen line is also done.
if (wlv.saved_n_extra <= 0) if (wlv.saved_n_extra <= 0)
@@ -2414,10 +2411,15 @@ win_line(
search_attr = saved_search_attr; search_attr = saved_search_attr;
if (area_attr == 0 && *ptr != NUL) if (area_attr == 0 && *ptr != NUL)
area_attr = saved_area_attr; area_attr = saved_area_attr;
// wlv.extra_attr should be used at this position but not
// any further. if (wlv.extra_for_textprop)
reset_extra_attr = TRUE; // wlv.extra_attr should be used at this position but
// not any further.
reset_extra_attr = TRUE;
} }
wlv.extra_for_textprop = FALSE;
in_linebreak = FALSE;
} }
#endif #endif
} }

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
945,
/**/ /**/
944, 944,
/**/ /**/