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

patch 8.2.4588: mapping with key after other matching mapping does not work

Browse Source 
Problem:    Mapping with key code after other matching mapping does not work.
Solution:   Change ">" to ">=". (closes #9903)
This commit is contained in:
Bram Moolenaar
2022-03-18 15:41:17 +00:00
parent 61efa16932
commit f35fd8e5d4
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/getchar.c
View File

@@ -2416,6 +2416,7 @@ handle_mapping(
mapblock_T *mp_match; mapblock_T *mp_match;
int mp_match_len = 0; int mp_match_len = 0;
int max_mlen = 0; int max_mlen = 0;
int want_termcode = 0; // 1 if termcode expected after max_mlen
int tb_c1; int tb_c1;
int mlen; int mlen;
#ifdef FEAT_LANGMAP #ifdef FEAT_LANGMAP
@@ -2591,9 +2592,16 @@ handle_mapping(
} }
else else
// No match; may have to check for termcode at next // No match; may have to check for termcode at next
// character. // character. If the first character that didn't match is
// K_SPECIAL then check for a termcode. This isn't perfect
// but should work in most cases.
if (max_mlen < mlen) if (max_mlen < mlen)
{
max_mlen = mlen; max_mlen = mlen;
want_termcode = mp->m_keys[mlen] == K_SPECIAL;
}
else if (max_mlen == mlen && mp->m_keys[mlen] == K_SPECIAL)
want_termcode = 1;
} }
} }
@@ -2646,7 +2654,7 @@ handle_mapping(
// May check for a terminal code when there is no mapping or only a partial // 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 // 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. // out, since that is nearly always a partial match with a terminal code.
if ((mp == NULL || max_mlen > mp_match_len if ((mp == NULL || max_mlen + want_termcode > mp_match_len
|| (mp_match_len == 1 && *mp->m_keys == ESC && !*timedout)) || (mp_match_len == 1 && *mp->m_keys == ESC && !*timedout))
&& keylen != KEYLEN_PART_MAP) && keylen != KEYLEN_PART_MAP)
{ {

9
src/testdir/test_termcodes.vim
View File

@@ -2111,6 +2111,15 @@ func Test_modifyOtherKeys_ambiguous_mapping()
unmap <C-J> unmap <C-J>
unmap <C-J>x unmap <C-J>x
" if a special character is following there should be a check for a termcode
nnoremap s aX<Esc>
nnoremap s<BS> aY<Esc>
set t_kb=
call setline(1, 'x')
call feedkeys("s\x08", 'Lx!')
call assert_equal('xY', getline(1))
set timeoutlen& set timeoutlen&
bwipe! bwipe!
endfunc endfunc

2
src/version.c
View File

@@ -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 */
/**/
4588,
/**/ /**/
4587, 4587,
/**/ /**/