X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flanguage.C;h=34e08854199483f00fa1aa0e91c99b50a7f7eb12;hb=37d42d45f3f4a5d3e916a080af50b37ae4a9d118;hp=c960edbca1e0be02a5f531cce9c9e715a373d46f;hpb=ecaf48dc268f677363d81ba4c04572c44ae712f3;p=lyx.git

diff --git a/src/language.C b/src/language.C
index c960edbca1..34e0885419 100644
--- a/src/language.C
+++ b/src/language.C
@@ -20,19 +20,22 @@
 #include "lyxrc.h"
 
 using std::endl;
+using std::string;
+
 
 Languages languages;
 Language const * english_language;
 Language const * default_language;
-Language ignore_lang("ignore", "ignore", "Ignore", false, 0, "ignore", "");
+Language ignore_lang("ignore", "ignore", "Ignore", false, "", 0, "ignore", "");
 Language const * ignore_language = &ignore_lang;
-Language latex_lang("latex", "latex", "Latex", false, 0, "latex", "");
+Language latex_lang("latex", "latex", "Latex", false, "", 0, "latex", "");
 Language const * latex_language = &latex_lang;
 
+
 void Languages::read(string const & filename)
 {
 	// We need to set the encoding of latex_lang
-	latex_lang = Language("latex", "latex", "Latex", false,
+	latex_lang = Language("latex", "latex", "Latex", false, "iso8859-1",
 			      encodings.getEncoding("iso8859-1"),
 			      "latex", "");
 
@@ -73,7 +76,7 @@ void Languages::read(string const & filename)
 		}
 
 		languagelist[lang] = Language(lang, babel, display, rtl,
-					      encoding, code, latex_options);
+					      encoding_str, encoding, code, latex_options);
 	}
 
 	default_language = getLanguage(lyxrc.default_language);
@@ -91,11 +94,9 @@ void Languages::read(string const & filename)
 		english_language = default_language;
 }
 
+
 Language const * Languages::getLanguage(string const & language) const
 {
 	const_iterator it = languagelist.find(language);
-	if (it != languagelist.end())
-		return &it->second;
-	else
-		return 0;
+	return it == languagelist.end() ? 0 : &it->second;
 }