patch 9.0.1711: dead code in charset.c
Commit:
https://github.com/vim/vim/commit/d3515a1e88cf25c1d5eae8faa965b587a124e687
Author: zeertzjq <[email protected]>
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 <[email protected]>
Co-authored-by: zeertzjq <[email protected]>
diff --git a/src/charset.c b/src/charset.c
index 92567bf7b..7ffd8d8a7 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 100dd95b3..3a7d4bb4d 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,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1qVFcF-000NOE-ED%40256bit.org.
