patch 9.1.0151: ml_get_buf_len() does not consider text properties
Commit:
https://github.com/vim/vim/commit/a72d1be5a9984709fc66f460b443ad4a38506113
Author: Christian Brabandt <[email protected]>
Date: Tue Mar 5 20:43:25 2024 +0100
patch 9.1.0151: ml_get_buf_len() does not consider text properties
Problem: ml_get_buf_len() does not consider text properties
(zeertzj)
Solution: Store text length excluding text properties length
in addition in the memline
related #14123
closes: #14133
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/change.c b/src/change.c
index 42e6f7939..847c18783 100644
--- a/src/change.c
+++ b/src/change.c
@@ -1364,6 +1364,7 @@ del_bytes(
mch_memmove(newp + newlen + 1, oldp + oldlen + 1,
(size_t)curbuf->b_ml.ml_line_len - oldlen - 1);
curbuf->b_ml.ml_line_len -= count;
+ curbuf->b_ml.ml_line_textlen = (int)STRLEN(newp) + 1;
}
#endif
diff --git a/src/edit.c b/src/edit.c
index 5760b06e8..d7c80ffcd 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -5070,6 +5070,7 @@ ins_tab(void)
vim_free(curbuf->b_ml.ml_line_ptr);
curbuf->b_ml.ml_line_ptr = newp;
curbuf->b_ml.ml_line_len -= i;
+ curbuf->b_ml.ml_line_textlen = (int)STRLEN(newp) + 1;
curbuf->b_ml.ml_flags =
(curbuf->b_ml.ml_flags | ML_LINE_DIRTY) & ~ML_EMPTY;
}
diff --git a/src/memline.c b/src/memline.c
index bbc13d7ed..19d037f9e 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -2703,7 +2703,7 @@ ml_get_buf_len(buf_T *buf, linenr_T lnum)
if (*ml_get_buf(buf, lnum, FALSE) == NUL)
return 0;
- return buf->b_ml.ml_line_len - 1;
+ return buf->b_ml.ml_line_textlen - 1;
}
/*
@@ -2737,6 +2737,7 @@ ml_get_buf(
errorret:
STRCPY(questions, "???");
buf->b_ml.ml_line_len = 4;
+ buf->b_ml.ml_line_textlen = buf->b_ml.ml_line_len;
buf->b_ml.ml_line_lnum = lnum;
return questions;
}
@@ -2746,6 +2747,7 @@ errorret:
if (buf->b_ml.ml_mfp == NULL) // there are no lines
{
buf->b_ml.ml_line_len = 1;
+ buf->b_ml.ml_line_textlen = buf->b_ml.ml_line_len;
return (char_u *)"";
}
@@ -2796,6 +2798,12 @@ errorret:
buf->b_ml.ml_line_ptr = (char_u *)dp + start;
buf->b_ml.ml_line_len = end - start;
+#if defined(FEAT_BYTEOFF) && defined(FEAT_PROP_POPUP)
+ if (buf->b_has_textprop)
+ buf->b_ml.ml_line_textlen = (int)STRLEN(buf->b_ml.ml_line_ptr) + 1;
+ else
+#endif
+ buf->b_ml.ml_line_textlen = buf->b_ml.ml_line_len;
buf->b_ml.ml_line_lnum = lnum;
buf->b_ml.ml_flags &= ~(ML_LINE_DIRTY | ML_ALLOCATED);
}
@@ -3646,6 +3654,7 @@ ml_replace_len(
curbuf->b_ml.ml_line_ptr = line;
curbuf->b_ml.ml_line_len = len;
+ curbuf->b_ml.ml_line_textlen = len_arg + 1;
curbuf->b_ml.ml_line_lnum = lnum;
curbuf->b_ml.ml_flags = (curbuf->b_ml.ml_flags | ML_LINE_DIRTY) &
~ML_EMPTY;
diff --git a/src/structs.h b/src/structs.h
index 2c6f55352..b3b3f6a14 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -802,7 +802,8 @@ typedef struct memline
#define ML_ALLOCATED 0x10 // ml_line_ptr is an allocated copy
int ml_flags;
- colnr_T ml_line_len; // length of the cached line, including NUL
+ colnr_T ml_line_len; // length of the cached line + textproperties,
including NUL
+ colnr_T ml_line_textlen;// length of the cached line, including NUL
linenr_T ml_line_lnum; // line number of cached line, 0 if not valid
char_u *ml_line_ptr; // pointer to cached line
diff --git a/src/version.c b/src/version.c
index 8c48034e7..ae5d17a1a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 151,
/**/
150,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rhaxG-001a4S-AG%40256bit.org.
