aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-27 09:24:23 -04:00
Code Activity

patch 8.2.2890: text property duplicated when data block splits

Browse Source 
Problem:    Text property duplicated when data block splits.
Solution:   Do not continue text prop from previous line. (closes #8261)
This commit is contained in:
Bram Moolenaar
2021-05-26 22:32:10 +02:00
parent c512599b22
commit 840f91f110
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/memline.c
View File

@@ -2772,7 +2772,8 @@ ml_append_int(
len = (colnr_T)STRLEN(line) + 1; // space needed for the text
#ifdef FEAT_PROP_POPUP
if (curbuf->b_has_textprop && lnum > 0 && !(flags & ML_APPEND_UNDO))
if (curbuf->b_has_textprop && lnum > 0
&& !(flags & (ML_APPEND_UNDO | ML_APPEND_NOPROP)))
// Add text properties that continue from the previous line.
add_text_props_for_append(buf, lnum, &line, &len, &tofree);
#endif
@@ -3992,7 +3993,11 @@ ml_flush_line(buf_T *buf)
*/
// How about handling errors???
(void)ml_append_int(buf, lnum, new_line, new_len,
(dp->db_index[idx] & DB_MARKED) ? ML_APPEND_MARK : 0);
((dp->db_index[idx] & DB_MARKED) ? ML_APPEND_MARK : 0)
#ifdef FEAT_PROP_POPUP
| ML_APPEND_NOPROP
#endif
);
(void)ml_delete_int(buf, lnum, 0);
}
}