changeset 28608:9ae7ccd90041 v8.2.4828

patch 8.2.4828: fix for unmapping simplified key not fully tested Commit: https://github.com/vim/vim/commit/abeb09b2c53054513812d1e56716e2a5abe8f354 Author: zeertzjq <zeertzjq@outlook.com> Date: Tue Apr 26 12:29:43 2022 +0100 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 https://github.com/vim/vim/issues/10292)
author Bram Moolenaar <Bram@vim.org>
date Tue, 26 Apr 2022 13:30:04 +0200
parents 039d9e2fbb46
children d38d48b0205f
files src/map.c src/testdir/test_mapping.vim src/version.c
diffstat 3 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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 */
 /**/
+    4828,
+/**/
     4827,
 /**/
     4826,