aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/edit.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-04-26 23:13:26 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-04-29 15:51:04 +0800
commit32da3e56cd12210cd567609f2ec7dd4f0c1ee4c6 (patch)
tree2ee70d1b7d6d6064519ffb3cc89a99cb8d43d515 /src/nvim/edit.c
parentf6afc7c3246db6e5bd8feab717b3c0dbf0226803 (diff)
downloadrneovim-32da3e56cd12210cd567609f2ec7dd4f0c1ee4c6.tar.gz
rneovim-32da3e56cd12210cd567609f2ec7dd4f0c1ee4c6.tar.bz2
rneovim-32da3e56cd12210cd567609f2ec7dd4f0c1ee4c6.zip
vim-patch:8.2.0916: mapping with partly modifyOtherKeys code does not work
Problem: Mapping with partly modifyOtherKeys code does not work. Solution: If there is no mapping with a separate modifier include the modifier in the key and then try mapping again. (closes vim/vim#6200) https://github.com/vim/vim/commit/975a880a1389e8ce6dea8d66a7c109140b2f94ec Cherry-pick applicable part of put_string_in_typebuf(). Revert related changes from 10a5825. Use KEYLEN_PART_KEY for incomplete modifier sequence. Omit test as it sends terminal codes. Use a Lua test instead.
Diffstat (limited to 'src/nvim/edit.c')
-rw-r--r--src/nvim/edit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index b8f88895a4..076cf445cf 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -5640,7 +5640,7 @@ int get_literal(bool no_simplify)
for (;;) {
nc = plain_vgetc();
if (!no_simplify) {
- nc = merge_modifiers(nc);
+ nc = merge_modifiers(nc, &mod_mask);
}
if ((mod_mask & ~MOD_MASK_SHIFT) != 0) {
// A character with non-Shift modifiers should not be a valid