mirror of
https://github.com/vim/vim.git
synced 2025-09-27 04:14:06 -04:00
patch 8.2.4551: when mapping <Esc> terminal codes are not recognized
Problem: When mapping <Esc> terminal codes are not recognized. Solution: Specifically recognize a mapping with just <Esc> and check for terminal codes even though there is no partial mapping. (closes #9903)
This commit is contained in:
@@ -2643,7 +2643,12 @@ handle_mapping(
|
|||||||
max_mlen = mlen + 1;
|
max_mlen = mlen + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((mp == NULL || max_mlen > mp_match_len) && keylen != KEYLEN_PART_MAP)
|
// May check for a terminal code when there is no mapping or only a partial
|
||||||
|
// mapping. Also check if there is a full mapping with <Esc>, unless timed
|
||||||
|
// out, since that is nearly always a partial match with a terminal code.
|
||||||
|
if ((mp == NULL || max_mlen > mp_match_len
|
||||||
|
|| (mp_match_len == 1 && *mp->m_keys == ESC && !*timedout))
|
||||||
|
&& keylen != KEYLEN_PART_MAP)
|
||||||
{
|
{
|
||||||
int save_keylen = keylen;
|
int save_keylen = keylen;
|
||||||
|
|
||||||
|
@@ -2331,6 +2331,22 @@ func Test_cmdline_literal()
|
|||||||
set timeoutlen&
|
set timeoutlen&
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_mapping_esc()
|
||||||
|
set timeoutlen=10
|
||||||
|
|
||||||
|
new
|
||||||
|
nnoremap <Up> iHello<Esc>
|
||||||
|
nnoremap <Esc> <Nop>
|
||||||
|
|
||||||
|
call feedkeys(substitute(&t_ku, '\*', '', 'g'), 'Lx!')
|
||||||
|
call assert_equal("Hello", getline(1))
|
||||||
|
|
||||||
|
bwipe!
|
||||||
|
nunmap <Up>
|
||||||
|
nunmap <Esc>
|
||||||
|
set timeoutlen&
|
||||||
|
endfunc
|
||||||
|
|
||||||
" Test for translation of special key codes (<xF1>, <xF2>, etc.)
|
" Test for translation of special key codes (<xF1>, <xF2>, etc.)
|
||||||
func Test_Keycode_Translation()
|
func Test_Keycode_Translation()
|
||||||
let keycodes = [
|
let keycodes = [
|
||||||
|
@@ -750,6 +750,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 */
|
||||||
|
/**/
|
||||||
|
4551,
|
||||||
/**/
|
/**/
|
||||||
4550,
|
4550,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user