Account for old versions of Pygments

[lyx.git] / src / Trans.cpp

diff --git a/src/Trans.cpp b/src/Trans.cpp
index 0e7d561c4e3bc891ba81f36767375123e07c7bbe..e2ba1abb5800c1a8ddb8e71f431f400a716dc964 100644 (file)
--- a/src/Trans.cpp
+++ b/src/Trans.cpp
@@ -280,10 +280,14 @@ int Trans::load(Lexer & lex)
                                    && it->second[1] == accent_2)
                                        break;
                        }
+
+                       // could not find accent2 on a key -- this should not happen.
+                       if (it == end)
+                               return -1;
+
                        docstring allowed;
                        if (!lex.next())
                                return -1;
-
                        allowed = lex.getDocString();
                        LYXERR(Debug::KBMAP, "allowed: " << to_utf8(allowed));
 
@@ -429,10 +433,9 @@ tex_accent getkeymod(string const & p)
 
 
 // TransFSMData
-TransFSMData::TransFSMData()
+TransFSMData::TransFSMData() : deadkey_(0), deadkey2_(0), init_state_(0),
+       deadkey_state_(0), combined_state_(0), currentState(0)
 {
-       deadkey_ = deadkey2_ = 0;
-       deadkey_info_.accent = deadkey2_info_.accent = TEX_NOACCENT;
 }