diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-04-24 17:07:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-04-24 17:07:53 +0100 |
| commit | a4e3332650021921068ef12923b4501c5b9918cb (patch) | |
| tree | 89004ee99786454fed5b603a31ebf3df798e3bf3 | |
| parent | ac92ab771952b2a9ee39ea6fa5e70e4c072942d5 (diff) | |
| download | vim-git-a4e3332650021921068ef12923b4501c5b9918cb.tar.gz | |
patch 8.2.4819: unmapping simplified keys also deletes other mappingv8.2.4819
Problem: Unmapping simplified keys also deletes other mapping.
Solution: Only unmap a mapping with m_simplified set. (closes #10270)
| -rw-r--r-- | src/map.c | 8 | ||||
| -rw-r--r-- | src/testdir/test_mapping.vim | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 20 insertions, 1 deletions
@@ -725,6 +725,9 @@ do_map( 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; @@ -814,7 +817,10 @@ do_map( { // delete entry if (!did_it) - retval = 2; // no match + { + if (!did_simplify || keyround == 2) + retval = 2; // no match + } else if (*keys == Ctrl_C) { // If CTRL-C has been unmapped, reuse it for Interrupting. diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim index 7fdbdf618..e0008d62a 100644 --- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -1627,4 +1627,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 diff --git a/src/version.c b/src/version.c index 74b4625eb..1d54137bf 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4819, +/**/ 4818, /**/ 4817, |