aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/keymap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/keymap.c')
-rw-r--r--src/nvim/keymap.c4
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;