changeset 32790:fbe3a843b6af v9.0.1711

patch 9.0.1711: dead code in charset.c Commit: https://github.com/vim/vim/commit/d3515a1e88cf25c1d5eae8faa965b587a124e687 Author: zeertzjq <zeertzjq@outlook.com> 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 <cb@256bit.org> Co-authored-by: zeertzjq <zeertzjq@outlook.com>
author Christian Brabandt <cb@256bit.org>
date Sun, 13 Aug 2023 20:15:03 +0200
parents 316cc9a2eaeb
children 53c4f1b63c44
files src/charset.c src/version.c
diffstat 2 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }
--- 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,