Mercurial > vim
diff src/memline.c @ 24703:4bc0bda6857d v8.2.2890
patch 8.2.2890: text property duplicated when data block splits
Commit: https://github.com/vim/vim/commit/840f91f110c4790a145e76eec453326445290f21
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed May 26 22:32:10 2021 +0200
patch 8.2.2890: text property duplicated when data block splits
Problem: Text property duplicated when data block splits.
Solution: Do not continue text prop from previous line. (closes https://github.com/vim/vim/issues/8261)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 26 May 2021 22:45:03 +0200 |
| parents | 5dfee9b1eabe |
| children | 7334bf933510 |
line wrap: on
line diff
--- a/src/memline.c +++ b/src/memline.c @@ -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); } }