Mercurial > vim
changeset 28590:86bf2dabc93a v8.2.4819
patch 8.2.4819: unmapping simplified keys also deletes other mapping
Commit: https://github.com/vim/vim/commit/a4e3332650021921068ef12923b4501c5b9918cb
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sun Apr 24 17:07:53 2022 +0100
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 https://github.com/vim/vim/issues/10270)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 24 Apr 2022 18:15:02 +0200 |
parents | 4ebd60103d52 |
children | 1efc196073c2 |
files | src/map.c src/testdir/test_mapping.vim src/version.c |
diffstat | 3 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/map.c +++ b/src/map.c @@ -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.
--- 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