X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.cpp;h=ffd55c4970a01865515bf71f28a43c550d37fcb8;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=8d51d77462fcad53145fb85d288c2292289f6b31;hpb=f05e76c330f5745ccd83d76a06cf64225be19390;p=lyx.git

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 8d51d77462..ffd55c4970 100644
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -37,11 +37,6 @@ using namespace lyx::support;
 
 namespace lyx {
 
-namespace {
-	// current format of bind files
-	static unsigned int const BIND_FORMAT = 1;
-}
-
 string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 {
 	string buf;
@@ -50,8 +45,15 @@ string const KeyMap::printKeySym(KeySymbol const & key, KeyModifier mod)
 
 	if (mod & ControlModifier)
 		buf += "C-";
+#if defined(USE_MACOSX_PACKAGING) || defined(USE_META_KEYBINDING)
+	if (mod & MetaModifier)
+		buf += "M-";
+	if (mod & AltModifier)
+		buf += "A-";
+#else
 	if (mod & AltModifier)
 		buf += "M-";
+#endif
 	if (mod & ShiftModifier)
 		buf += "S-";
 
@@ -252,18 +254,17 @@ bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
 	if (retval != FormatMismatch)
 		return retval == ReadOK;
 
-	LYXERR(Debug::FILES, "Converting bind file to " << BIND_FORMAT);
+	LYXERR(Debug::FILES, "Converting bind file to " << LFUN_FORMAT);
 	FileName const tempfile = FileName::tempName("convert_bind");
 	bool const success = prefs2prefs(bind_file, tempfile, true);
 	if (!success) {
 		LYXERR0 ("Unable to convert " << bind_file <<
-			" to format " << BIND_FORMAT);
+			" to format " << LFUN_FORMAT);
 		return false;
 	}
 	retval = readWithoutConv(tempfile, unbind_map);
-	//tempfile.removeFile();
+	tempfile.removeFile();
 	return retval == ReadOK;
-	return true;
 }
 
 
@@ -383,7 +384,7 @@ KeyMap::ReturnValues KeyMap::readWithoutConv(FileName const & bind_file, KeyMap
 
 		// This is triggered the first time through the loop unless
 		// we hit a format tag.
-		if (format != BIND_FORMAT)
+		if (format != LFUN_FORMAT)
 			return FormatMismatch;
 	}
 
@@ -403,7 +404,7 @@ void KeyMap::write(string const & bind_file, bool append, bool unbind) const
 	if (!append)
 		os << "## This file is automatically generated by lyx\n"
 		   << "## All modifications will be lost\n\n"
-		   << "Format " << BIND_FORMAT << "\n\n";
+		   << "Format " << LFUN_FORMAT << "\n\n";
 
 	string tag = unbind ? "\\unbind" : "\\bind";
 	BindingList const list = listBindings(false);