X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFont.cpp;h=3ba04eba4756f9a6f2fcdccce2cf766433181db2;hb=bfe98181169d9e697e515da974d9b6a15a06c940;hp=b70c237db4d14498f798ea42e60c2a2036b9400d;hpb=d38eddb397de982a379d8c0644c6ca2190c67fe9;p=lyx.git

diff --git a/src/Font.cpp b/src/Font.cpp
index b70c237db4..3ba04eba47 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -399,10 +399,6 @@ int Font::latexWriteStartChanges(otexstream & os, BufferParams const & bparams,
 			os << '}';
 			++count;
 		} else if (f.color() != Color_none) {
-			if (needs_cprotection) {
-				os << "\\cprotect";
-				count += 9;
-			}
 			os << "\\textcolor{"
 			   << from_ascii(lcolor.getLaTeXName(f.color()))
 			   << "}{";
@@ -635,7 +631,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
 		bool const using_begin_end =
 			runparams.use_polyglossia ||
 				!lyxrc.language_command_end.empty();
-		if (using_begin_end)
+		if (using_begin_end && !languageStackEmpty())
 			popLanguageName();
 	}