diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-12-30 22:07:40 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-12-30 22:07:40 +0100 |
| commit | 8caa10a8ec6e398fd67c30b8a2bf20638d3c6c0a (patch) | |
| tree | 535faab94973f88630251166a17eab841dd2731a | |
| parent | ef0a1d5ed3566b91143d30ae9de3240f47c6e282 (diff) | |
| download | vim-git-8.1.0663.tar.gz | |
patch 8.1.0663: text property display wrong when 'number' is setv8.1.0663
Problem: Text property display wrong when 'number' is set. (Dominique
Pelle)
Solution: Compare with "vcol" instead of "col".
| -rw-r--r-- | src/screen.c | 4 | ||||
| -rw-r--r-- | 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 @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 663, +/**/ 662, /**/ 661, |