Mercurial > vim
changeset 29651:23dceecc0bf8 v9.0.0166
patch 9.0.0166: when using text properties line text length computed twice
Commit: https://github.com/vim/vim/commit/50652b0c5cfc9d48d3561772420e1f01f878f033
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 7 21:48:37 2022 +0100
patch 9.0.0166: when using text properties line text length computed twice
Problem: When using text properties the line text length is computed twice.
Solution: If the text lenght was already computed don't do it again.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 07 Aug 2022 23:00:03 +0200 |
parents | e5f6f17e0170 |
children | 85fd541404a5 |
files | src/memline.c src/version.c |
diffstat | 2 files changed, 24 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/memline.c +++ b/src/memline.c @@ -2821,6 +2821,9 @@ ml_append_int( infoptr_T *ip; #ifdef FEAT_PROP_POPUP char_u *tofree = NULL; +# ifdef FEAT_BYTEOFF + colnr_T text_len = 0; // text len with NUL without text properties +# endif #endif int ret = FAIL; @@ -2831,7 +2834,19 @@ ml_append_int( lowest_marked = lnum + 1; if (len == 0) + { len = (colnr_T)STRLEN(line) + 1; // space needed for the text +#if defined(FEAT_PROP_POPUP) && defined(FEAT_BYTEOFF) + text_len = len; +#endif + } +#if defined(FEAT_PROP_POPUP) && defined(FEAT_BYTEOFF) + else if (curbuf->b_has_textprop) + // "len" may include text properties, get the length of the text. + text_len = (colnr_T)STRLEN(line) + 1; + else + text_len = len; +#endif #ifdef FEAT_PROP_POPUP if (curbuf->b_has_textprop && lnum > 0 @@ -3292,13 +3307,14 @@ ml_append_int( } #ifdef FEAT_BYTEOFF + // The line was inserted below 'lnum' + ml_updatechunk(buf, lnum + 1, # ifdef FEAT_PROP_POPUP - if (curbuf->b_has_textprop) - // only use the space needed for the text, ignore properties - len = (colnr_T)STRLEN(line) + 1; -# endif - // The line was inserted below 'lnum' - ml_updatechunk(buf, lnum + 1, (long)len, ML_CHNK_ADDLINE); + (long)text_len +# else + (long)len +#endif + , ML_CHNK_ADDLINE); #endif #ifdef FEAT_NETBEANS_INTG