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;
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-";
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);
// 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;
}
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);