aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 8.1.0676: textprop screendump test fails

Browse Source 
Problem:    Textprop screendump test fails.
Solution:   Add missing changes.
This commit is contained in:
Bram Moolenaar
2019-01-01 20:31:31 +01:00
parent b9c67a51c1
commit 5e53ac00a2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/screen.c
View File

@@ -4326,13 +4326,14 @@ win_line(
if (text_props != NULL) if (text_props != NULL)
{ {
int pi; int pi;
int bcol = (int)(ptr - line);
// Check if any active property ends. // Check if any active property ends.
for (pi = 0; pi < text_props_active; ++pi) for (pi = 0; pi < text_props_active; ++pi)
{ {
int tpi = text_prop_idxs[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) + text_props[tpi].tp_len)
{ {
if (pi + 1 < text_props_active) if (pi + 1 < text_props_active)
@@ -4347,7 +4348,7 @@ win_line(
// Add any text property that starts in this column. // Add any text property that starts in this column.
while (text_prop_next < text_prop_count 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_idxs[text_props_active++] = text_prop_next++;
text_prop_attr = 0; text_prop_attr = 0;

2
src/version.c
View File

@@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
676,
/**/ /**/
675, 675,
/**/ /**/