fix aspell encoding (confirmed on linux, cygwin and native windows,

[lyx.git] / src / kbmap.C

diff --git a/src/kbmap.C b/src/kbmap.C
index d2492e73096562303a0d39e2c6e11569144ece70..b744f9d88f1771fa187fd2bf154f09c9b4ce8705 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -26,7 +26,11 @@
 
 #include <sstream>
 
-using lyx::support::i18nLibFileSearch;
+
+namespace lyx {
+
+using support::FileName;
+using support::i18nLibFileSearch;
 
 using std::endl;
 using std::string;
@@ -103,7 +107,7 @@ bool kb_keymap::read(string const & bind_file)
        if (lyxerr.debugging(Debug::PARSER))
                lexrc.printTable(lyxerr);
 
-       string const tmp = i18nLibFileSearch("bind", bind_file, "bind");
+       FileName const tmp(i18nLibFileSearch("bind", bind_file, "bind"));
        lexrc.setFile(tmp);
        if (!lexrc.isOK()) {
                lyxerr << "kb_keymap::read: cannot open bind file:"
@@ -197,7 +201,7 @@ kb_keymap::lookup(LyXKeySymPtr key,
                        if (cit->table.get()) {
                                // this is a prefix key - set new map
                                seq->curmap = cit->table.get();
-                               static FuncRequest prefix(LFUN_PREFIX);
+                               static FuncRequest prefix(LFUN_COMMAND_PREFIX);
                                return prefix;
                        } else {
                                // final key - reset map
@@ -342,3 +346,6 @@ kb_keymap::find1keybinding(FuncRequest const & func) const
 
        return std::make_pair<LyXKeySym const *, key_modifier::state>(0, key_modifier::none);
 }
+
+
+} // namespace lyx