# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1546204506 -3600
# Node ID 34a04c9a3575a18d680a5f59910cb7611b94d6e7
# Parent  b048e245e48f89e69eafa1088aa31ee56d65c2ba
patch 8.1.0663: text property display wrong when 'number' is set

commit https://github.com/vim/vim/commit/8caa10a8ec6e398fd67c30b8a2bf20638d3c6c0a
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Dec 30 22:07:40 2018 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    663,
+/**/
     662,
 /**/
     661,