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)

diff --git a/src/map.c b/src/map.c
index ea7567e8d56f7cc7c440101c5e8eb2d1ab9951a5..186550a1f5bdab1966366066146a6f59ddaa5c08 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -726,6 +726,8 @@ do_map(
                                    mpp = &(mp->m_next);
                                    continue;
                                }
+                               // In keyround for simplified keys, don't unmap
+                               // a mapping without m_simplified flag.
                                if (keyround1_simplified && !mp->m_simplified)
                                    break;
                                // We reset the indicated mode bits. If nothing

diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index e0008d62a272a8781af126053f65b01b2ba9fe11..b413f4fc345b8efa590e59dc22a14ecb352f811f 100644 (file)
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -1627,7 +1627,7 @@ func Test_mouse_drag_insert_map()
   set mouse&
 endfunc
 
-func Test_unmap_simplfied()
+func Test_unmap_simplifiable()
   map <C-I> foo
   map <Tab> bar
   call assert_equal('foo', maparg('<C-I>'))
@@ -1636,6 +1636,11 @@ func Test_unmap_simplfied()
   call assert_equal('', maparg('<C-I>'))
   call assert_equal('bar', maparg('<Tab>'))
   unmap <Tab>
+
+  map <C-I> foo
+  unmap <Tab>
+  " This should not error
+  unmap <C-I>
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index 2998d2d360349129a00bf817813b177c1793343e..945b6a18a70d649d3e9e8dffe449973b5b5b63ca 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4828,
 /**/
     4827,
 /**/