hopefully fix tex2lyx linking.

[lyx.git] / src / kbmap.C

diff --git a/src/kbmap.C b/src/kbmap.C
index 9377be0c436b01e77684c83b2b0c34d9b58b0083..30161748cb8dda04c22fbd546aec93162f064914 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -26,7 +26,10 @@
 
 #include <sstream>
 
-using lyx::support::i18nLibFileSearch;
+
+namespace lyx {
+
+using support::i18nLibFileSearch;
 
 using std::endl;
 using std::string;
@@ -197,7 +200,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
@@ -255,6 +258,7 @@ void kb_keymap::defkey(kb_sequence * seq,
                                        it->table.reset();
                                }
                                it->func = func;
+                               it->func.origin = FuncRequest::KEYBOARD;
                                return;
                        } else if (!it->table.get()) {
                                lyxerr << "Error: New binding for '" << seq->print()
@@ -273,6 +277,7 @@ void kb_keymap::defkey(kb_sequence * seq,
        newone->mod = seq->modifiers[r];
        if (r + 1 == seq->length()) {
                newone->func = func;
+               newone->func.origin = FuncRequest::KEYBOARD;
                newone->table.reset();
                return;
        } else {
@@ -340,3 +345,6 @@ kb_keymap::find1keybinding(FuncRequest const & func) const
 
        return std::make_pair<LyXKeySym const *, key_modifier::state>(0, key_modifier::none);
 }
+
+
+} // namespace lyx