another pesky \#warning snuck in

[lyx.git] / src / trans.C

diff --git a/src/trans.C b/src/trans.C
index b2d6543d457930fd819bceda122877060fbae412..4e2d45c20a7e5355057fe5d54436aab07ce8ea47 100644 (file)
--- a/src/trans.C
+++ b/src/trans.C
@@ -351,7 +351,7 @@ string const Trans::process(char c, TransManager & k)
        if (t.empty() && c != 0) {
                dt[0] = c;
                return k.normalkey(c, dt);
-       } else if (!t.empty()) {
+       } else if (!t.empty() && t[0] != char(0)) {
                dt = t;
                return k.normalkey(c, dt);
        } else {
@@ -363,7 +363,7 @@ string const Trans::process(char c, TransManager & k)
 
 int Trans::Load(string const & language)
 {
-       string filename = LibFileSearch("kbd", language, "kmap");
+       string const filename = LibFileSearch("kbd", language, "kmap");
        if (filename.empty())
                return -1;
 
@@ -371,7 +371,7 @@ int Trans::Load(string const & language)
        LyXLex lex(kmapTags, K_LAST-1);
        lex.setFile(filename);
        
-       int res = Load(lex);
+       int const res = Load(lex);
 
        if (res == 0) {
                name_ = language;