diff options
author | zeertzjq <zeertzjq@outlook.com> | 2022-04-30 05:58:13 +0800 |
---|---|---|
committer | zeertzjq <zeertzjq@outlook.com> | 2022-04-30 06:07:00 +0800 |
commit | 1f72e315503fbaa802270bbad0650c73ef39e3e2 (patch) | |
tree | 82817b8be4cfdf4dbd3cf929ed58b634c090f72f /src | |
parent | 02e9a402cae7fd477e097e2656d9ff6c397a0f56 (diff) | |
download | rneovim-1f72e315503fbaa802270bbad0650c73ef39e3e2.tar.gz rneovim-1f72e315503fbaa802270bbad0650c73ef39e3e2.tar.bz2 rneovim-1f72e315503fbaa802270bbad0650c73ef39e3e2.zip |
vim-patch:8.2.4845: duplicate code
Problem: Duplicate code.
Solution: Move code below if/else. (closes vim/vim#10314)
https://github.com/vim/vim/commit/590f365f91511c164253c5b5812d4d0fc4a238d6
N/A patches for version.c:
vim-patch:8.2.4844: <C-S-I> is simplified to <S-Tab>
Problem: <C-S-I> is simplified to <S-Tab>.
Solution: Do not simplify CTRL if there is also SHIFT. (closes vim/vim#10313)
https://github.com/vim/vim/commit/758a8d199988b5b25566b2820db60dc2c9de3e58
vim-patch:8.2.4846: termcodes test fails
Problem: Termcodes test fails.
Solution: use CTRL-SHIFT-V to insert an unsimplified key. (closes vim/vim#10316)
https://github.com/vim/vim/commit/bad8a013c238595aa206690210eb1367fbc878f9
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/state.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/nvim/state.c b/src/nvim/state.c index 056828574f..6f4bab62d1 100644 --- a/src/nvim/state.c +++ b/src/nvim/state.c @@ -187,22 +187,17 @@ void get_mode(char *buf) if (State & VREPLACE_FLAG) { buf[i++] = 'R'; buf[i++] = 'v'; - if (ins_compl_active()) { - buf[i++] = 'c'; - } else if (ctrl_x_mode_not_defined_yet()) { - buf[i++] = 'x'; - } } else { if (State & REPLACE_FLAG) { buf[i++] = 'R'; } else { buf[i++] = 'i'; } - if (ins_compl_active()) { - buf[i++] = 'c'; - } else if (ctrl_x_mode_not_defined_yet()) { - buf[i++] = 'x'; - } + } + if (ins_compl_active()) { + buf[i++] = 'c'; + } else if (ctrl_x_mode_not_defined_yet()) { + buf[i++] = 'x'; } } else if ((State & CMDLINE) || exmode_active) { buf[i++] = 'c'; |