i += 2;
continue;
case 'm': case 'M':
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+ mod |= MetaModifier;
+ i += 2;
+ continue;
+#endif
+ case 'a': case 'A':
mod |= AltModifier;
i += 2;
continue;
i += 3;
continue;
case 'm': case 'M':
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+ nmod |= MetaModifier;
+ i += 3;
+ continue;
+#endif
+ case 'a': case 'A':
nmod |= AltModifier;
i += 3;
continue;
if (mod & ControlModifier)
buf += "C-";
if (mod & AltModifier)
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+ buf += "A-";
+ if (mod & MetaModifier)
+#endif
buf += "M-";
if (mod & ShiftModifier)
buf += "S-";
}
-void KeySequence::mark_deleted()
-{
- deleted_ = true;
-}
-
-
void KeySequence::reset()
{
- mark_deleted();
+ deleted_ = true;
curmap = stdmap;
}
return;
sequence.pop_back();
modifiers.pop_back();
+ if (sequence.empty())
+ deleted_ = true;
}