diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-04-27 20:21:04 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-04-29 15:51:04 +0800 |
| commit | c14d89f306e8ca49758f49f0e48aa3ce88130ac4 (patch) | |
| tree | b7b8bd4d42ff73bfc61a48936d977f57b7a9d325 | |
| parent | 04a437b280b13bd33c37e99c46403198126d5343 (diff) | |
| download | rneovim-c14d89f306e8ca49758f49f0e48aa3ce88130ac4.tar.gz rneovim-c14d89f306e8ca49758f49f0e48aa3ce88130ac4.tar.bz2 rneovim-c14d89f306e8ca49758f49f0e48aa3ce88130ac4.zip | |
vim-patch:8.2.4819: unmapping simplified keys also deletes other mapping
Problem: Unmapping simplified keys also deletes other mapping.
Solution: Only unmap a mapping with m_simplified set. (closes vim/vim#10270)
https://github.com/vim/vim/commit/a4e3332650021921068ef12923b4501c5b9918cb
| -rw-r--r-- | src/nvim/getchar.c | 7 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mapping.vim | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 555eadb5d4..1fb3f827c1 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -3248,6 +3248,9 @@ int buf_do_map(int maptype, MapArguments *args, int mode, bool is_abbrev, buf_T mpp = &(mp->m_next); continue; } + if (did_simplify && keyround == 1 && !mp->m_simplified) { + break; + } // We reset the indicated mode bits. If nothing // is left the entry is deleted below. mp->m_mode &= ~mode; @@ -3319,7 +3322,9 @@ int buf_do_map(int maptype, MapArguments *args, int mode, bool is_abbrev, buf_T if (maptype == 1) { // delete entry if (!did_it) { - retval = 2; // no match + if (!did_simplify || keyround == 2) { + retval = 2; // no match + } } else if (*lhs == Ctrl_C) { // If CTRL-C has been unmapped, reuse it for Interrupting. if (map_table == buf->b_maphash) { diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim index 8c399ff3b1..88735a34b8 100644 --- a/src/nvim/testdir/test_mapping.vim +++ b/src/nvim/testdir/test_mapping.vim @@ -761,4 +761,15 @@ func Test_mouse_drag_insert_map() set mouse& endfunc +func Test_unmap_simplfied() + map <C-I> foo + map <Tab> bar + call assert_equal('foo', maparg('<C-I>')) + call assert_equal('bar', maparg('<Tab>')) + unmap <C-I> + call assert_equal('', maparg('<C-I>')) + call assert_equal('bar', maparg('<Tab>')) + unmap <Tab> +endfunc + " vim: shiftwidth=2 sts=2 expandtab |