aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-04-25 22:36:59 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-04-29 15:51:04 +0800
commit6832b626ea1b3413c445dfc23f4d921335dfeaf3 (patch)
tree3f212750320f94c5845c9122a999087251337586 /src
parent66747f18ded775e2c0b6bac73cee18a3752086af (diff)
downloadrneovim-6832b626ea1b3413c445dfc23f4d921335dfeaf3.tar.gz
rneovim-6832b626ea1b3413c445dfc23f4d921335dfeaf3.tar.bz2
rneovim-6832b626ea1b3413c445dfc23f4d921335dfeaf3.zip
vim-patch:8.2.0851: can't distinguish <M-a> from accented "a" in the GUI
Problem: Can't distinguish <M-a> from accented "a" in the GUI. Solution: Use another way to make mapping <C-bslash> work. (closes vim/vim#6163) https://github.com/vim/vim/commit/f4ae6b245a54f11dd967d06b80f30e5abf55fb82
Diffstat (limited to 'src')
-rw-r--r--src/nvim/getchar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index fbe503bcd4..9a89170a10 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1450,13 +1450,14 @@ int merge_modifiers(int c_arg)
if (mod_mask & MOD_MASK_CTRL) {
if ((c >= '`' && c <= 0x7f) || (c >= '@' && c <= '_')) {
c &= 0x1f;
- mod_mask &= ~MOD_MASK_CTRL;
if (c == 0) {
c = K_ZERO;
}
} else if (c == '6') {
// CTRL-6 is equivalent to CTRL-^
c = 0x1e;
+ }
+ if (c != c_arg) {
mod_mask &= ~MOD_MASK_CTRL;
}
}