aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 9.0.0940: crash when typing a letter in a terminal window

Browse Source 
Problem:    Crash when typing a letter in a terminal window. (Shane-XB-Qian)
Solution:   Use the "vterm" variable instead of getting the terminal pointer
            from the current buffer.  (closes #11608)
This commit is contained in:
Bram Moolenaar
2022-11-24 14:05:19 +00:00
parent 47f1fdc28c
commit ebed1b0bea
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/terminal.c
View File

@@ -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 // 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. // keyboard protocol should use "i". Applies to all ascii letters.
if (ASCII_ISUPPER(c) 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)) && mod == (VTERM_MOD_CTRL | VTERM_MOD_SHIFT))
c = TOLOWER_ASC(c); c = TOLOWER_ASC(c);

5
src/testdir/test_termcodes.vim
View File

@@ -2156,6 +2156,9 @@ func Test_modifyOtherKeys_no_mapping()
endfunc endfunc
func Test_CSIu_keys_without_modifiers() 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 " Escape sent as `CSI 27 u` should act as normal escape and not undo
call setline(1, 'a') call setline(1, 'a')
call feedkeys('a' .. GetEscCodeCSIuWithoutModifier("\e"), 'Lx!') call feedkeys('a' .. GetEscCodeCSIuWithoutModifier("\e"), 'Lx!')
@@ -2166,6 +2169,8 @@ func Test_CSIu_keys_without_modifiers()
call setline(1, '') call setline(1, '')
call feedkeys('a' .. GetEscCodeCSIuWithoutModifier("\t") .. "\<Esc>", 'Lx!') call feedkeys('a' .. GetEscCodeCSIuWithoutModifier("\t") .. "\<Esc>", 'Lx!')
call assert_equal("\t", getline(1)) call assert_equal("\t", getline(1))
set timeoutlen&
endfunc endfunc
" Check that when DEC mouse codes are recognized a special key is handled. " Check that when DEC mouse codes are recognized a special key is handled.

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
940,
/**/ /**/
939, 939,
/**/ /**/