1
0
forked from aniani/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 #10292)
This commit is contained in:
zeertzjq
2022-04-26 12:29:43 +01:00
committed by Bram Moolenaar
parent 87f74106f9
commit abeb09b2c5
3 changed files with 10 additions and 1 deletions

View File

@@ -726,6 +726,8 @@ do_map(
mpp = &(mp->m_next); mpp = &(mp->m_next);
continue; continue;
} }
// In keyround for simplified keys, don't unmap
// a mapping without m_simplified flag.
if (keyround1_simplified && !mp->m_simplified) if (keyround1_simplified && !mp->m_simplified)
break; break;
// We reset the indicated mode bits. If nothing // We reset the indicated mode bits. If nothing

View File

@@ -1627,7 +1627,7 @@ func Test_mouse_drag_insert_map()
set mouse& set mouse&
endfunc endfunc
func Test_unmap_simplfied() func Test_unmap_simplifiable()
map <C-I> foo map <C-I> foo
map <Tab> bar map <Tab> bar
call assert_equal('foo', maparg('<C-I>')) call assert_equal('foo', maparg('<C-I>'))
@@ -1636,6 +1636,11 @@ func Test_unmap_simplfied()
call assert_equal('', maparg('<C-I>')) call assert_equal('', maparg('<C-I>'))
call assert_equal('bar', maparg('<Tab>')) call assert_equal('bar', maparg('<Tab>'))
unmap <Tab> unmap <Tab>
map <C-I> foo
unmap <Tab>
" This should not error
unmap <C-I>
endfunc endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4828,
/**/ /**/
4827, 4827,
/**/ /**/