X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_pimpl.C;h=42ec28da89bfc29a2794968895aa9ea4b034bfda;hb=5091380d6bad1686800e384ed1bbb03836a15aab;hp=84bda8d103b37f55d6431a4e3daeba75fde42bb6;hpb=5d443af86a79f7d58098fe574bd034e320292c00;p=lyx.git

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 84bda8d103..42ec28da89 100644
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -591,9 +591,6 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
 		Language const * language = fcit->font().language();
 		if (language->babel() != doc_language->babel() &&
 		    language != ignore_language &&
-#ifdef INHERIT_LANGUAGE
-		    language != inherit_language &&
-#endif
 		    language != latex_language)
 		{
 			features.useLanguage(language);
@@ -656,19 +653,11 @@ LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
 	while (par && par->getDepth() && !tmpfont.resolved()) {
 		par = par->outerHook();
 		if (par) {
-			tmpfont.realize(par->layout()->font
-#ifdef INHERIT_LANGUAGE
-					, bparams.language
-#endif
-					);
+			tmpfont.realize(par->layout()->font);
 			par_depth = par->getDepth();
 		}
 	}
 
-	tmpfont.realize(tclass.defaultfont()
-#ifdef INHERIT_LANGUAGE
-		, bparams.language
-#endif
-		);
+	tmpfont.realize(tclass.defaultfont());
 	return tmpfont;
 }