From c14d89f306e8ca49758f49f0e48aa3ce88130ac4 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 27 Apr 2022 20:21:04 +0800 Subject: 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 --- src/nvim/getchar.c | 7 ++++++- src/nvim/testdir/test_mapping.vim | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'src') 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 foo + map bar + call assert_equal('foo', maparg('')) + call assert_equal('bar', maparg('')) + unmap + call assert_equal('', maparg('')) + call assert_equal('bar', maparg('')) + unmap +endfunc + " vim: shiftwidth=2 sts=2 expandtab -- cgit