From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 24 Nov 2022 23:04:02 +0000 (+0000)
Subject: patch 9.0.0945: failures in the cursorline test
X-Git-Tag: v9.0.0945
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=637862fc3ca68e3fc1ea9a178bd7f9d25a6e773b;p=vim

patch 9.0.0945: failures in the cursorline test

Problem:    Failures in the cursorline test.
Solution:   Reset extra_attr only after a text property.
---

diff --git a/src/drawline.c b/src/drawline.c
index e6fdd7a0b..408f2d5bd 100644
--- a/src/drawline.c
+++ b/src/drawline.c
@@ -2403,9 +2403,6 @@ win_line(
 #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)
@@ -2414,10 +2411,15 @@ win_line(
 			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;
+
+		    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
 	}
diff --git a/src/version.c b/src/version.c
index b234cce90..875252892 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    945,
 /**/
     944,
 /**/