# HG changeset patch # User Bram Moolenaar # Date 1546371905 -3600 # Node ID 5fa7af143f7f7545db3197676680ae0d94aa3276 # Parent 2e039e3ff5f63fceb95ec9647c6a25ddb13bce29 patch 8.1.0676: textprop screendump test fails commit https://github.com/vim/vim/commit/5e53ac00a2a3ead7b52ef56c61ccce823186bd2f Author: Bram Moolenaar 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. diff --git a/src/screen.c b/src/screen.c --- 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 --- 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,