Patch 9.0.0945

[Bram Moolenaar]

Patch 9.0.0945 (after 9.0.0944)
Problem: Failures in the cursorline test.
Solution: Reset extra_attr only after a text property.
Files: src/drawline.c


*** ../vim-9.0.0944/src/drawline.c 2022-11-24 22:42:06.927385902 +0000
--- src/drawline.c 2022-11-24 23:00:43.661189547 +0000
***************
*** 2403,2411 ****
#if defined(FEAT_PROP_POPUP)
if (wlv.n_extra <= 0)
{
- wlv.extra_for_textprop = FALSE;
- in_linebreak = FALSE;
-
// Only restore search_attr and area_attr after "n_extra" in
// the next screen line is also done.
if (wlv.saved_n_extra <= 0)
--- 2403,2408 ----
***************
*** 2414,2423 ****
search_attr = saved_search_attr;
if (area_attr == 0 && *ptr != NUL)
area_attr = saved_area_attr;
! // wlv.extra_attr should be used at this position but not
! // any further.
! reset_extra_attr = TRUE;
}
}
#endif
}
--- 2411,2425 ----
search_attr = saved_search_attr;
if (area_attr == 0 && *ptr != NUL)
area_attr = saved_area_attr;
!
! if (wlv.extra_for_textprop)
! // 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
}
*** ../vim-9.0.0944/src/version.c 2022-11-24 22:42:06.927385902 +0000
--- src/version.c 2022-11-24 23:02:29.649082558 +0000
***************
*** 697,698 ****
--- 697,700 ----
{ /* Add new patch number below this line */
+ /**/
+ 945,
/**/

--
"The sun oozed over the horizon, shoved aside darkness, crept along the
greensward, and, with sickly fingers, pushed through the castle window,
revealing the pillaged princess, hand at throat, crown asunder, gaping
in frenzied horror at the sated, sodden amphibian lying beside her,
disbelieving the magnitude of the frog's deception, screaming madly,
"You lied!"
- Winner of the Bulwer-Lytton contest (San Jose State University),
wherein one writes only the first line of a bad novel

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///