summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/terminal.c2
-rw-r--r--src/testdir/test_termcodes.vim5
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/src/terminal.c b/src/terminal.c
index d0cdd4500..bc363175f 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1590,7 +1590,7 @@ term_convert_key(term_T *term, int c, int modmask, char *buf)
// Ctrl-Shift-i may have the key "I" instead of "i", but for the kitty
// keyboard protocol should use "i". Applies to all ascii letters.
if (ASCII_ISUPPER(c)
- && vterm_is_kitty_keyboard(curbuf->b_term->tl_vterm)
+ && vterm_is_kitty_keyboard(vterm)
&& mod == (VTERM_MOD_CTRL | VTERM_MOD_SHIFT))
c = TOLOWER_ASC(c);
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 8cab98b77..97b06c606 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -2156,6 +2156,9 @@ func Test_modifyOtherKeys_no_mapping()
endfunc
func Test_CSIu_keys_without_modifiers()
+ " make this execute faster
+ set timeoutlen=10
+
" Escape sent as `CSI 27 u` should act as normal escape and not undo
call setline(1, 'a')
call feedkeys('a' .. GetEscCodeCSIuWithoutModifier("\e"), 'Lx!')
@@ -2166,6 +2169,8 @@ func Test_CSIu_keys_without_modifiers()
call setline(1, '')
call feedkeys('a' .. GetEscCodeCSIuWithoutModifier("\t") .. "\<Esc>", 'Lx!')
call assert_equal("\t", getline(1))
+
+ set timeoutlen&
endfunc
" Check that when DEC mouse codes are recognized a special key is handled.
diff --git a/src/version.c b/src/version.c
index 86f857e4f..da0b1e5a5 100644
--- 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 */
/**/
+ 940,
+/**/
939,
/**/
938,