Mercurial > vim
changeset 28127:b9e8f3674090 v8.2.4588
patch 8.2.4588: mapping with key after other matching mapping does not work
Commit: https://github.com/vim/vim/commit/f35fd8e5d484be0e3fdd7c3c24f690083f91264d
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Mar 18 15:41:17 2022 +0000
patch 8.2.4588: mapping with key after other matching mapping does not work
Problem: Mapping with key code after other matching mapping does not work.
Solution: Change ">" to ">=". (closes https://github.com/vim/vim/issues/9903)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 18 Mar 2022 16:45:03 +0100 |
| parents | b8f593e7c080 |
| children | afa443a6179a |
| files | src/getchar.c src/testdir/test_termcodes.vim src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/getchar.c +++ b/src/getchar.c @@ -2416,6 +2416,7 @@ handle_mapping( mapblock_T *mp_match; int mp_match_len = 0; int max_mlen = 0; + int want_termcode = 0; // 1 if termcode expected after max_mlen int tb_c1; int mlen; #ifdef FEAT_LANGMAP @@ -2591,9 +2592,16 @@ handle_mapping( } else // 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) + { 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 // 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 + if ((mp == NULL || max_mlen + want_termcode > mp_match_len || (mp_match_len == 1 && *mp->m_keys == ESC && !*timedout)) && keylen != KEYLEN_PART_MAP) {
--- a/src/testdir/test_termcodes.vim +++ b/src/testdir/test_termcodes.vim @@ -2111,6 +2111,15 @@ func Test_modifyOtherKeys_ambiguous_mapp unmap <C-J> 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& bwipe! endfunc