InsetParamsDialog: fix Restore button enabling/disabling.

[lyx.git] / src / KeyMap.cpp

diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp
index 9592e0144aef25d1ee355798fbca42f7df980465..61e4562cf09dc85a5702b596046a62e9d927a562 100644 (file)
--- a/src/KeyMap.cpp
+++ b/src/KeyMap.cpp
@@ -262,11 +262,11 @@ bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
 
        lexrc.setFile(bind_file);
        if (!lexrc.isOK()) {
-               LYXERR0("KeyMap::read: cannot open bind file:" << bind_file.absFilename());
+               LYXERR0("KeyMap::read: cannot open bind file:" << bind_file.absFileName());
                return false;
        }
 
-       LYXERR(Debug::KBMAP, "Reading bind file:" << bind_file.absFilename());
+       LYXERR(Debug::KBMAP, "Reading bind file:" << bind_file.absFileName());
 
        bool error = false;
        while (lexrc.isOK()) {
@@ -349,7 +349,7 @@ bool KeyMap::read(FileName const & bind_file, KeyMap * unbind_map)
        }
 
        if (error)
-               LYXERR0("KeyMap::read: error while reading bind file:" << bind_file.absFilename());
+               LYXERR0("KeyMap::read: error while reading bind file:" << bind_file.absFileName());
        return !error;
 }
 
@@ -371,12 +371,12 @@ void KeyMap::write(string const & bind_file, bool append, bool unbind) const
                FuncCode action = it->request.action();
                string arg = to_utf8(it->request.argument());
 
+               string const cmd = lyxaction.getActionName(action)
+                       + (arg.empty() ? string() : " " + arg) ;
                os << tag << " \""
-                               << to_utf8(it->sequence.print(KeySequence::BindFile))
-                               << "\" \""
-                               << lyxaction.getActionName(action)
-                               << (arg.empty() ? "" : " ") << arg
-                               << "\"\n";
+                  << to_utf8(it->sequence.print(KeySequence::BindFile))
+                  << "\" " << Lexer::quoteString(cmd)
+                  << "\n";
        }
        os << "\n";
        os.close();