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)
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;
set timeoutlen&
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.)
func Test_Keycode_Translation()
let keycodes = [
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 4551,
/**/
4550,
/**/