Mercurial > vim
comparison src/screen.c @ 15337:5fa7af143f7f v8.1.0676
patch 8.1.0676: textprop screendump test fails
commit https://github.com/vim/vim/commit/5e53ac00a2a3ead7b52ef56c61ccce823186bd2f
Author: Bram Moolenaar <Bram@vim.org>
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 01 Jan 2019 20:45:05 +0100 |
| parents | 0eed23d9733a |
| children | be92862a0cb4 |
comparison
equal
deleted
inserted
replaced
| 15336:2e039e3ff5f6 | 15337:5fa7af143f7f |
|---|---|
| 4324 | 4324 |
| 4325 #ifdef FEAT_TEXT_PROP | 4325 #ifdef FEAT_TEXT_PROP |
| 4326 if (text_props != NULL) | 4326 if (text_props != NULL) |
| 4327 { | 4327 { |
| 4328 int pi; | 4328 int pi; |
| 4329 int bcol = (int)(ptr - line); | |
| 4329 | 4330 |
| 4330 // Check if any active property ends. | 4331 // Check if any active property ends. |
| 4331 for (pi = 0; pi < text_props_active; ++pi) | 4332 for (pi = 0; pi < text_props_active; ++pi) |
| 4332 { | 4333 { |
| 4333 int tpi = text_prop_idxs[pi]; | 4334 int tpi = text_prop_idxs[pi]; |
| 4334 | 4335 |
| 4335 if (vcol >= text_props[tpi].tp_col - 1 | 4336 if (bcol >= text_props[tpi].tp_col - 1 |
| 4336 + text_props[tpi].tp_len) | 4337 + text_props[tpi].tp_len) |
| 4337 { | 4338 { |
| 4338 if (pi + 1 < text_props_active) | 4339 if (pi + 1 < text_props_active) |
| 4339 mch_memmove(text_prop_idxs + pi, | 4340 mch_memmove(text_prop_idxs + pi, |
| 4340 text_prop_idxs + pi + 1, | 4341 text_prop_idxs + pi + 1, |
| 4345 } | 4346 } |
| 4346 } | 4347 } |
| 4347 | 4348 |
| 4348 // Add any text property that starts in this column. | 4349 // Add any text property that starts in this column. |
| 4349 while (text_prop_next < text_prop_count | 4350 while (text_prop_next < text_prop_count |
| 4350 && vcol >= text_props[text_prop_next].tp_col - 1) | 4351 && bcol >= text_props[text_prop_next].tp_col - 1) |
| 4351 text_prop_idxs[text_props_active++] = text_prop_next++; | 4352 text_prop_idxs[text_props_active++] = text_prop_next++; |
| 4352 | 4353 |
| 4353 text_prop_attr = 0; | 4354 text_prop_attr = 0; |
| 4354 if (text_props_active > 0) | 4355 if (text_props_active > 0) |
| 4355 { | 4356 { |