aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/getchar.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-06-11 07:00:56 +0800
committerGitHub <noreply@github.com>2022-06-11 07:00:56 +0800
commit2b252430aa9ef52de7da733e2c0221c97111bce2 (patch)
tree6eef91bf02d45cf32cd0aa660002df5b758d866c /src/nvim/getchar.c
parent673b3a780e969132330099c9b6008a766280e384 (diff)
downloadrneovim-2b252430aa9ef52de7da733e2c0221c97111bce2.tar.gz
rneovim-2b252430aa9ef52de7da733e2c0221c97111bce2.tar.bz2
rneovim-2b252430aa9ef52de7da733e2c0221c97111bce2.zip
vim-patch:8.2.5076: unnecessary code (#18922)
Problem: Unnecessary code. Solution: Remove code and replace with function call. (closes vim/vim#10552) https://github.com/vim/vim/commit/2e7cba347fc8b746add12aa5e0e9f6218a76c788
Diffstat (limited to 'src/nvim/getchar.c')
-rw-r--r--src/nvim/getchar.c27
1 files changed, 6 insertions, 21 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 9f223bf750..7f783fd72f 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -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.
/// Uses cmd_silent, KeyTyped and KeyNoremap to restore the flags belonging to
/// the char.
+///
/// @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];
- int len = 0;
- if (modifier != 0) {
- buf[0] = K_SPECIAL;
- 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);
- }
+ unsigned int len = special_to_buf(c, modifiers, true, buf);
+ assert(len < sizeof(buf));
+ buf[len] = NUL;
(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