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 #10270)
diff --git a/src/map.c b/src/map.c
index d99a84f..f3ff007 100644
--- a/src/map.c
+++ b/src/map.c
@@ -725,6 +725,9 @@
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 @@
{
// 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.