summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/screen.c4
-rw-r--r--src/version.c2
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,