patch 8.1.0676: textprop screendump test fails

Problem:    Textprop screendump test fails.
Solution:   Add missing changes.

diff --git a/src/screen.c b/src/screen.c
index 55874e99fbf29de197e35dde195b782ac874571d..e0e9d3b7e2d3775aeed136b6943b61b75c292470 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -4326,13 +4326,14 @@ win_line(
            if (text_props != NULL)
            {
                int pi;
+               int bcol = (int)(ptr - line);
 
                // Check if any active property ends.
                for (pi = 0; pi < text_props_active; ++pi)
                {
                    int tpi = text_prop_idxs[pi];
 
-                   if (vcol >= text_props[tpi].tp_col - 1
+                   if (bcol >= text_props[tpi].tp_col - 1
                                                  + text_props[tpi].tp_len)
                    {
                        if (pi + 1 < text_props_active)
@@ -4347,7 +4348,7 @@ win_line(
 
                // Add any text property that starts in this column.
                while (text_prop_next < text_prop_count
-                          && vcol >= text_props[text_prop_next].tp_col - 1)
+                          && bcol >= text_props[text_prop_next].tp_col - 1)
                    text_prop_idxs[text_props_active++] = text_prop_next++;
 
                text_prop_attr = 0;

diff --git a/src/version.c b/src/version.c
index e3db6e5e3564af4d9d0467d53198f335c5cd1302..53dda7f1d31ac86b1cdfa044de4347ed6906d835 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    676,
 /**/
     675,
 /**/