patch 8.1.0663: text property display wrong when 'number' is set

Problem:    Text property display wrong when 'number' is set. (Dominique
            Pelle)
Solution:   Compare with "vcol"  instead of "col".

diff --git a/src/screen.c b/src/screen.c
index 62f0d136d77bc77f187ee14b8b866e546ce0bfc3..4166928fe084508b62bea364eeb19c80ada6dbb3 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -4304,7 +4304,7 @@ win_line(
                {
                    int tpi = text_prop_idxs[pi];
 
-                   if (col >= text_props[tpi].tp_col - 1
+                   if (vcol >= text_props[tpi].tp_col - 1
                                                  + text_props[tpi].tp_len)
                    {
                        if (pi + 1 < text_props_active)
@@ -4319,7 +4319,7 @@ win_line(
 
                // Add any text property that starts in this column.
                while (text_prop_next < text_prop_count
-                          && col >= text_props[text_prop_next].tp_col - 1)
+                          && vcol >= text_props[text_prop_next].tp_col - 1)
                    text_prop_idxs[text_props_active++] = text_prop_next++;
 
                text_prop_type = NULL;

diff --git a/src/version.c b/src/version.c
index c2869ce766ac050c17e358fed878321fde73fd81..4c5ee1bb0fc75f13977816e9b7abc44b86884e58 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 */
+/**/
+    663,
 /**/
     662,
 /**/