X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeySequence.cpp;h=3bee9caadbd47ffb28c701b43b4adbff0a3b069b;hb=f58d7dfe7b86ebaca38301747643c4fb460365fe;hp=cc6a5bd9855da6fd4535b1813f5821903da1bcac;hpb=275c9cde02b234f114d0a05eb941fbb61f09ba9e;p=lyx.git

diff --git a/src/KeySequence.cpp b/src/KeySequence.cpp
index cc6a5bd985..3bee9caadb 100644
--- a/src/KeySequence.cpp
+++ b/src/KeySequence.cpp
@@ -70,6 +70,12 @@ size_t KeySequence::parse(string const & s)
 				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;
@@ -88,6 +94,12 @@ size_t KeySequence::parse(string const & s)
 				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;
@@ -113,8 +125,7 @@ size_t KeySequence::parse(string const & s)
 		}
 	}
 
-	// empty sequence?
-	if (sequence.size() == 0)
+	if (sequence.empty())
 		return 0;
 
 	// everything is fine
@@ -141,6 +152,10 @@ docstring const KeySequence::print(outputFormat format) const
 			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-";