# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1675706403 -3600
# Node ID 69003e374f0da6a236798dbdb2bc62c3a463e3c2
# Parent  998a319376474f7e76f7ec93cd1bd2ba1461f22c
patch 9.0.1287: with the Kitty key protocl Esc with NumLock cannot be mapped

Commit: https://github.com/vim/vim/commit/0261e3978e3064176f57008d4ce6de18cb166b69
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Feb 6 17:46:37 2023 +0000

    patch 9.0.1287: with the Kitty key protocl Esc with NumLock cannot be mapped

    Problem:    With the Kitty key protocl Esc with NumLock cannot be mapped.
    Solution:   Also use K_ESC when there is a modifier. (closes https://github.com/vim/vim/issues/11811)

diff --git a/src/term.c b/src/term.c
--- a/src/term.c
+++ b/src/term.c
@@ -5349,6 +5349,11 @@ handle_key_with_modifier(
     if ((modifiers & MOD_MASK_SHIFT) && key >= 'a' && key <= 'z')
 	key += 'A' - 'a';
 
+    // Putting Esc in the buffer creates ambiguity, it can be the start of an
+    // escape sequence.  Use K_ESC to avoid that.
+    if (key == ESC)
+	key = K_ESC;
+
     return put_key_modifiers_in_typebuf(key, modifiers,
 					csi_len, offset, buf, bufsize, buflen);
 }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1287,
+/**/
     1286,
 /**/
     1285,