X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=312199d62c0f39405fb0aba242c9a9ac547ed960;hb=d6fecb4aa47899ea3fe02d1699e0ffc81f364910;hp=4883d1b4f7a96329e52d99cad39a4545375fbed1;hpb=a8a2bd463c1ae7a14f1273604186131ff3798777;p=lyx.git

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 4883d1b4f7..312199d62c 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -53,6 +53,10 @@ enum OpenEncoding {
 	CJK
 };
 
+// FIXME THREAD
+// There could easily be a conflict here, with the export process
+// setting this one way, and a View>Source process (possbily for
+// another Buffer) resetting it.
 static int open_encoding_ = none;
 static int cjk_inherited_ = 0;
 Language const * prev_env_language_ = 0;
@@ -523,7 +527,8 @@ void TeXOnePar(Buffer const & buf,
 	       string const & everypar,
 	       int start_pos, int end_pos)
 {
-	BufferParams const & bparams = buf.params();
+	BufferParams const & bparams = runparams_in.is_child
+		? buf.masterParams() : buf.params();
 	ParagraphList const & paragraphs = text.paragraphs();
 	Paragraph const & par = paragraphs.at(pit);
 	// FIXME This check should not really be needed.