changeset 15337:5fa7af143f7f v8.1.0676

patch 8.1.0676: textprop screendump test fails commit https://github.com/vim/vim/commit/5e53ac00a2a3ead7b52ef56c61ccce823186bd2f Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jan 1 20:31:31 2019 +0100 patch 8.1.0676: textprop screendump test fails Problem: Textprop screendump test fails. Solution: Add missing changes.
author Bram Moolenaar <Bram@vim.org>
date Tue, 01 Jan 2019 20:45:05 +0100
parents 2e039e3ff5f6
children 8fe428256607
files src/screen.c src/version.c
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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 */
 /**/
+    676,
+/**/
     675,
 /**/
     674,