Mercurial > vim
changeset 29111:bfb205095634 v8.2.5076
patch 8.2.5076: unnecessary code
Commit: https://github.com/vim/vim/commit/2e7cba347fc8b746add12aa5e0e9f6218a76c788
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Jun 10 15:30:32 2022 +0100
patch 8.2.5076: unnecessary code
Problem: Unnecessary code.
Solution: Remove code and replace with function call. (closes https://github.com/vim/vim/issues/10552)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 10 Jun 2022 16:45:03 +0200 |
parents | 7aef804534ff |
children | a8ee24a8bde1 |
files | src/drawline.c src/getchar.c src/version.c |
diffstat | 3 files changed, 11 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawline.c +++ b/src/drawline.c @@ -2116,14 +2116,15 @@ win_line( mb_utf8 = FALSE; } - if ((trailcol != MAXCOL && ptr > line + trailcol && c == ' ') - || (leadcol != 0 && ptr < line + leadcol && c == ' ')) + if (c == ' ' && ((trailcol != MAXCOL && ptr > line + trailcol) + || (leadcol != 0 && ptr < line + leadcol))) { if (leadcol != 0 && in_multispace && ptr < line + leadcol && wp->w_lcs_chars.leadmultispace != NULL) { 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; } @@ -2133,7 +2134,7 @@ win_line( else if (ptr < line + leadcol && 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;
--- a/src/getchar.c +++ b/src/getchar.c @@ -1115,33 +1115,12 @@ ins_typebuf( * Returns the length of what was inserted. */ int -ins_char_typebuf(int c, int modifier) +ins_char_typebuf(int c, int modifiers) { char_u buf[MB_MAXBYTES * 3 + 4]; - int len = 0; - - if (modifier != 0) - { - 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; - } + int len = special_to_buf(c, modifiers, TRUE, buf); + + buf[len] = NUL; (void)ins_typebuf(buf, KeyNoremap, 0, !KeyTyped, cmd_silent); return len; }