mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 05:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.5076: unnecessary code (#18922)

Browse Source 
Problem:    Unnecessary code.
Solution:   Remove code and replace with function call. (closes vim/vim#10552)
2e7cba347f
This commit is contained in:
zeertzjq
2022-06-11 07:00:56 +08:00
committed by GitHub
parent 673b3a780e
commit 2b252430aa
2 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/nvim/getchar.c
View File

@@ -990,31 +990,16 @@ int ins_typebuf(char *str, int noremap, int offset, bool nottyped, bool silent)
/// Can be used for a character obtained by vgetc() that needs to be put back. /// Can be used for a character obtained by vgetc() that needs to be put back.
/// Uses cmd_silent, KeyTyped and KeyNoremap to restore the flags belonging to /// Uses cmd_silent, KeyTyped and KeyNoremap to restore the flags belonging to
/// the char. /// the char.
///
/// @return the length of what was inserted /// @return the length of what was inserted
int ins_char_typebuf(int c, int modifier) int ins_char_typebuf(int c, int modifiers)
{ {
char_u buf[MB_MAXBYTES * 3 + 4]; char_u buf[MB_MAXBYTES * 3 + 4];
int len = 0; unsigned int len = special_to_buf(c, modifiers, true, buf);
if (modifier != 0) { assert(len < sizeof(buf));
buf[0] = K_SPECIAL; buf[len] = NUL;
buf[1] = KS_MODIFIER;
buf[2] = (char_u)modifier;
buf[3] = NUL;
len = 3;
}
if (IS_SPECIAL(c)) {
buf[len] = K_SPECIAL;
buf[len + 1] = (char_u)K_SECOND(c);
buf[len + 2] = (char_u)K_THIRD(c);
buf[len + 3] = NUL;
len += 3;
} else {
char_u *end = add_char2buf(c, buf + len);
*end = NUL;
len = (int)(end - buf);
}
(void)ins_typebuf((char *)buf, KeyNoremap, 0, !KeyTyped, cmd_silent); (void)ins_typebuf((char *)buf, KeyNoremap, 0, !KeyTyped, cmd_silent);
return len; return (int)len;
} }
/// Return TRUE if the typeahead buffer was changed (while waiting for a /// Return TRUE if the typeahead buffer was changed (while waiting for a

6
src/nvim/screen.c
View File

@@ -3440,8 +3440,8 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
} }
} }
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_p_lcs_chars.leadmultispace != NULL) { && wp->w_p_lcs_chars.leadmultispace != NULL) {
c = wp->w_p_lcs_chars.leadmultispace[multispace_pos++]; c = wp->w_p_lcs_chars.leadmultispace[multispace_pos++];
@@ -3452,7 +3452,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool noc
c = wp->w_p_lcs_chars.trail; c = wp->w_p_lcs_chars.trail;
} else if (ptr < line + leadcol && wp->w_p_lcs_chars.lead) { } else if (ptr < line + leadcol && wp->w_p_lcs_chars.lead) {
c = wp->w_p_lcs_chars.lead; c = wp->w_p_lcs_chars.lead;
} else if (leadcol != 0 && c == ' ' && wp->w_p_lcs_chars.space) { } else if (leadcol != 0 && wp->w_p_lcs_chars.space) {
c = wp->w_p_lcs_chars.space; c = wp->w_p_lcs_chars.space;
} }