Change the "empty layout" to the "plain layout", to try to avoid confusion.

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index 04de993ebd0ce98026494a88bf396d57d227d91a..e4bb4314d8440cbf33488dbfa011bc5fdbee2028 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -30,10 +30,10 @@ namespace lyx {
 Languages languages;
 Language ignore_lang;
 Language latex_lang;
-Language const * english_language;
 Language const * default_language;
 Language const * ignore_language = &ignore_lang;
 Language const * latex_language = &latex_lang;
+Language const * reset_language = 0;
 
 
 bool Language::read(Lexer & lex)
@@ -86,16 +86,17 @@ void Languages::read(FileName const & filename)
                        default_language = &(*languagelist.begin()).second;
                LYXERR0("Using \"" << default_language->lang() << "\" instead!");
        }
-       english_language = getLanguage("english");
-       if (!english_language)
-               english_language = default_language;
 }
 
 
 Language const * Languages::getLanguage(string const & language) const
 {
+       if (language == "reset")
+               return reset_language;
+       if (language == "ignore")
+               return ignore_language;
        const_iterator it = languagelist.find(language);
-       return it == languagelist.end() ? 0 : &it->second;
+       return it == languagelist.end() ? reset_language : &it->second;
 }