patch 9.0.1711: dead code in charset.c

Problem: dead code in charset.c
Solution: remove it

linetabsize_col() calls init_chartabsize_arg() with 0 as "lnum", so
cts.cts_has_prop_with_text is always FALSE.

closes: #PR

Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>

diff --git a/src/charset.c b/src/charset.c
index 92567bf7bce72e3c1de9b723672c3850c724d29c..7ffd8d8a753985b621e751d18d67e3c13beeaeba 100644 (file)
--- a/src/charset.c
+++ b/src/charset.c
@@ -769,14 +769,6 @@ linetabsize_col(int startcol, char_u *s)
     init_chartabsize_arg(&cts, curwin, 0, startcol, s, s);
     while (*cts.cts_ptr != NUL)
        cts.cts_vcol += lbr_chartabsize_adv(&cts);
-#ifdef FEAT_PROP_POPUP
-    if (cts.cts_has_prop_with_text && cts.cts_ptr == cts.cts_line)
-    {
-       // check for virtual text in an empty line
-       (void)lbr_chartabsize_adv(&cts);
-       cts.cts_vcol += cts.cts_cur_text_width;
-    }
-#endif
     clear_chartabsize_arg(&cts);
     return (int)cts.cts_vcol;
 }

diff --git a/src/version.c b/src/version.c
index 100dd95b30854ff40bf5389c7f0ac3afbe31aadd..3a7d4bb4db99a8fed4b4b0db1641a65cb83d7789 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1711,
 /**/
     1710,
 /**/