aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.5076: unnecessary code

Browse Source 
Problem:    Unnecessary code.
Solution:   Remove code and replace with function call. (closes #10552)
This commit is contained in:
zeertzjq
2022-06-10 15:30:32 +01:00
committed by Bram Moolenaar
parent b74e046491
commit 2e7cba347f
3 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/drawline.c
View File

@@ -2116,14 +2116,15 @@ win_line(
mb_utf8 = FALSE; mb_utf8 = FALSE;
} }
if ((trailcol != MAXCOL && ptr > line + trailcol && c == ' ') if (c == ' ' && ((trailcol != MAXCOL && ptr > line + trailcol)
|| (leadcol != 0 && ptr < line + leadcol && c == ' ')) || (leadcol != 0 && ptr < line + leadcol)))
{ {
if (leadcol != 0 && in_multispace && ptr < line + leadcol if (leadcol != 0 && in_multispace && ptr < line + leadcol
&& wp->w_lcs_chars.leadmultispace != NULL) && wp->w_lcs_chars.leadmultispace != NULL)
{ {
c = wp->w_lcs_chars.leadmultispace[multispace_pos++]; c = wp->w_lcs_chars.leadmultispace[multispace_pos++];
if (wp->w_lcs_chars.leadmultispace[multispace_pos] == NUL) if (wp->w_lcs_chars.leadmultispace[multispace_pos]
== NUL)
multispace_pos = 0; multispace_pos = 0;
} }
@@ -2133,7 +2134,7 @@ win_line(
else if (ptr < line + leadcol && wp->w_lcs_chars.lead) else if (ptr < line + leadcol && wp->w_lcs_chars.lead)
c = wp->w_lcs_chars.lead; c = wp->w_lcs_chars.lead;
else if (leadcol != 0 && c == ' ' && wp->w_lcs_chars.space) else if (leadcol != 0 && wp->w_lcs_chars.space)
c = wp->w_lcs_chars.space; c = wp->w_lcs_chars.space;

27
src/getchar.c
View File

@@ -1115,33 +1115,12 @@ ins_typebuf(
* Returns the length of what was inserted. * Returns the length of what was inserted.
*/ */
int int
ins_char_typebuf(int c, int modifier) ins_char_typebuf(int c, int modifiers)
{ {
char_u buf[MB_MAXBYTES * 3 + 4]; char_u buf[MB_MAXBYTES * 3 + 4];
int len = 0; int len = special_to_buf(c, modifiers, TRUE, buf);
if (modifier != 0) buf[len] = NUL;
{
buf[0] = K_SPECIAL;
buf[1] = KS_MODIFIER;
buf[2] = modifier;
buf[3] = NUL;
len = 3;
}
if (IS_SPECIAL(c))
{
buf[len] = K_SPECIAL;
buf[len + 1] = K_SECOND(c);
buf[len + 2] = K_THIRD(c);
buf[len + 3] = NUL;
len += 3;
}
else
{
char_u *end = add_char2buf(c, buf + len);
*end = NUL;
len = end - buf;
}
(void)ins_typebuf(buf, KeyNoremap, 0, !KeyTyped, cmd_silent); (void)ins_typebuf(buf, KeyNoremap, 0, !KeyTyped, cmd_silent);
return len; return len;
} }

2
src/version.c
View File

@@ -734,6 +734,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 */
/**/
5076,
/**/ /**/
5075, 5075,
/**/ /**/