From d3515a1e88cf25c1d5eae8faa965b587a124e687 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 3 Jul 2023 22:00:04 +0800 Subject: [PATCH] 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 Co-authored-by: zeertzjq --- src/charset.c | 8 -------- src/version.c | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/charset.c b/src/charset.c index 92567bf7bc..7ffd8d8a75 100644 --- 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 100dd95b30..3a7d4bb4db 100644 --- 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, /**/