X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=e4bb4314d8440cbf33488dbfa011bc5fdbee2028;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=0c734d56cd2bc4de39a0ce8e97632398d8cc44a2;hpb=0e5945667aa2e1c2508955df450c30eec8316d07;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 0c734d56cd..e4bb4314d8 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -21,8 +21,6 @@
 #include "support/debug.h"
 #include "support/FileName.h"
 
-#include <ostream>
-
 using namespace std;
 using namespace lyx::support;
 
@@ -32,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)
@@ -88,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;
 }