# HG changeset patch # User Christian Brabandt # Date 1691950503 -7200 # Node ID fbe3a843b6afff65d000d33554d8f01154b6647a # Parent 316cc9a2eaebc1d7e8c2ea4a5bc5cd6c27cb9869 patch 9.0.1711: dead code in charset.c Commit: https://github.com/vim/vim/commit/d3515a1e88cf25c1d5eae8faa965b587a124e687 Author: zeertzjq Date: Mon Jul 3 22:00:04 2023 +0800 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 diff --git a/src/charset.c b/src/charset.c --- 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 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1711, +/**/ 1710, /**/ 1709,