diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-11-20 09:15:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 09:15:39 -0500 |
| commit | 978857e0c25384489c08309ec8128d3a1c8b5e3e (patch) | |
| tree | cfc3a74eb076710784cd04e2e4e2fa96bd74b571 /src/nvim/keymap.c | |
| parent | 480b04122e93826bdfc74fbeacab2d94b089420f (diff) | |
| parent | a88bc4d95ebcddae7364c932b45b71ffc109b190 (diff) | |
| download | rneovim-978857e0c25384489c08309ec8128d3a1c8b5e3e.tar.gz rneovim-978857e0c25384489c08309ec8128d3a1c8b5e3e.tar.bz2 rneovim-978857e0c25384489c08309ec8128d3a1c8b5e3e.zip | |
Merge pull request #12592 from jamessan/fix-mod-keys
Diffstat (limited to 'src/nvim/keymap.c')
| -rw-r--r-- | src/nvim/keymap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c index 2b6f022d9d..517274a1d3 100644 --- a/src/nvim/keymap.c +++ b/src/nvim/keymap.c @@ -156,6 +156,7 @@ static const struct key_name_entry { { K_BS, "BS" }, { K_BS, "BackSpace" }, // Alternative name { ESC, "Esc" }, + { ESC, "Escape" }, // Alternative name { CSI, "CSI" }, { K_CSI, "xCSI" }, { '|', "Bar" }, @@ -711,7 +712,8 @@ static int extract_modifiers(int key, int *modp) { int modifiers = *modp; - if (!(modifiers & MOD_MASK_CMD)) { // Command-key is special + // Command-key and ctrl are special + if (!(modifiers & MOD_MASK_CMD) && !(modifiers & MOD_MASK_CTRL)) { if ((modifiers & MOD_MASK_SHIFT) && ASCII_ISALPHA(key)) { key = TOUPPER_ASC(key); modifiers &= ~MOD_MASK_SHIFT; |