Re: [pacth] bug 3653: content of listings inset is effected by document language changes

[Jürgen Spitzmüller]

Jürgen Spitzmüller wrote:
> Please test. I'll commit if I get two OKs (Uwe, Bo?).

Better patch attached.

Jürgen

Index: src/insets/InsetListings.cpp
===================================================================
--- src/insets/InsetListings.cpp	(revision 18408)
+++ src/insets/InsetListings.cpp	(working copy)
@@ -42,14 +42,10 @@
 	Font font(Font::ALL_SANE);
 	font.decSize();
 	font.decSize();
-	font.setColor(Color::foreground);
+	font.setColor(Color::latex);
 	setLabelFont(font);
-	// FIXME: english_language?
-	text_.current_font.setLanguage(english_language);
-	text_.real_current_font.setLanguage(english_language);
-	// FIXME: why I can not make text of source code black with the following two lines?
-	text_.current_font.setColor(Color::foreground);
-	text_.real_current_font.setColor(Color::foreground);
+	text_.current_font.setLanguage(latex_language);
+	text_.real_current_font.setLanguage(latex_language);
 }
 
 
@@ -119,7 +115,7 @@
 			break;
 		}
 	}
-	InsetCollapsable::read(buf, lex);
+	InsetERT::read(buf, lex);
 }
 
 
@@ -255,9 +251,9 @@
 
 void InsetListings::getDrawFont(Font & font) const
 {
-	font = Font(Font::ALL_INHERIT, english_language);
+	font = Font(Font::ALL_INHERIT, latex_language);
 	font.setFamily(Font::TYPEWRITER_FAMILY);
-	font.setColor(Color::foreground);
+	font.setColor(Color::latex);
 }