diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-04-27 20:27:38 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-04-29 15:51:04 +0800 |
| commit | f2b512ad75cace9126eb0ea644daedd758c238e6 (patch) | |
| tree | f14dd7d7dca055ef218221414e081e474e101919 | |
| parent | 11b5a376bc1594639a539f1789167f3d5ec3f775 (diff) | |
| download | rneovim-f2b512ad75cace9126eb0ea644daedd758c238e6.tar.gz rneovim-f2b512ad75cace9126eb0ea644daedd758c238e6.tar.bz2 rneovim-f2b512ad75cace9126eb0ea644daedd758c238e6.zip | |
vim-patch:8.2.4828: fix for unmapping simplified key not fully tested
Problem: Fix for unmapping simplified key not fully tested.
Solution: Add a test case. (closes vim/vim#10292)
https://github.com/vim/vim/commit/abeb09b2c53054513812d1e56716e2a5abe8f354
| -rw-r--r-- | src/nvim/getchar.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mapping.vim | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 167898bb1e..2fe732d6f4 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -3249,6 +3249,8 @@ int buf_do_map(int maptype, MapArguments *args, int mode, bool is_abbrev, buf_T mpp = &(mp->m_next); continue; } + // In keyround for simplified keys, don't unmap + // a mapping without m_simplified flag. if (keyround1_simplified && !mp->m_simplified) { break; } diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index 88735a34b8..6bb8d82021 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -761,7 +761,7 @@ func Test_mouse_drag_insert_map() set mouse& endfunc -func Test_unmap_simplfied() +func Test_unmap_simplifiable() map <C-I> foo map <Tab> bar call assert_equal('foo', maparg('<C-I>')) @@ -770,6 +770,11 @@ func Test_unmap_simplfied() call assert_equal('', maparg('<C-I>')) call assert_equal('bar', maparg('<Tab>')) unmap <Tab> + + map <C-I> foo + unmap <Tab> + " This should not error + unmap <C-I> endfunc " vim: shiftwidth=2 sts=2 expandtab |