From 38ea2733b4dd8e9bfc4a5bb5c11cb661bf000c4e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 7 Aug 2022 22:04:56 +0100 Subject: patch 9.0.0167: checking for text properties could be a bit more efficient Problem: Checking for text properties could be a bit more efficient. Solution: Return early when there are no text properties. Update TODO items. --- src/textprop.c | 9 +++------ src/version.c | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/textprop.c b/src/textprop.c index 679535375..d67ec4c7e 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -11,12 +11,8 @@ * Text properties implementation. See ":help text-properties". * * TODO: - * - Checking the text length to detect text properties is slow. Use a flag in - * the index, like DB_MARKED? * - Also test line2byte() with many lines, so that ml_updatechunk() is taken * into account. - * - Perhaps have a window-local option to disable highlighting from text - * properties? */ #include "vim.h" @@ -579,13 +575,14 @@ get_text_props(buf_T *buf, linenr_T lnum, char_u **props, int will_change) text = ml_get_buf(buf, lnum, will_change); textlen = STRLEN(text) + 1; proplen = buf->b_ml.ml_line_len - textlen; + if (proplen == 0) + return 0; if (proplen % sizeof(textprop_T) != 0) { iemsg(_(e_text_property_info_corrupted)); return 0; } - if (proplen > 0) - *props = text + textlen; + *props = text + textlen; return (int)(proplen / sizeof(textprop_T)); } diff --git a/src/version.c b/src/version.c index 7544d6f1a..4bab4a58d 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 167, /**/ 166, /**/ -- cgit v1.2.1