aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.1711: dead code in charset.c

Browse Source 
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>
This commit is contained in:
zeertzjq 2023-07-03 22:00:04 +08:00 committed by Christian Brabandt
parent 4a8eb6e7a9
commit d3515a1e88
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/charset.c
View File

@ -769,14 +769,6 @@ linetabsize_col(int startcol, char_u *s)
init_chartabsize_arg(&cts, curwin, 0, startcol, s, s); init_chartabsize_arg(&cts, curwin, 0, startcol, s, s);
while (*cts.cts_ptr != NUL) while (*cts.cts_ptr != NUL)
cts.cts_vcol += lbr_chartabsize_adv(&cts); 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); clear_chartabsize_arg(&cts);
return (int)cts.cts_vcol; return (int)cts.cts_vcol;
} }

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1711,
/**/ /**/
1710, 1710,
/**/ /**/