From 8caa10a8ec6e398fd67c30b8a2bf20638d3c6c0a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 30 Dec 2018 22:07:40 +0100 Subject: 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". --- src/screen.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/screen.c b/src/screen.c index 62f0d136d..4166928fe 100644 --- 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 c2869ce76..4c5ee1bb0 100644 --- 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, /**/ -- cgit v1.2.1