[LyX/master] Amend 6def81f30ff4f73. Never switch encodings with XeTeX or LuaTeX.

[Günter Milde]

commit 2183978f1a0456791cfd4365d8c1cc2082c74226
Author: Günter Milde <mi...@lyx.org>
Date:   Fri Apr 5 16:14:58 2019 +0200

    Amend 6def81f30ff4f73. Never switch encodings with XeTeX or LuaTeX.
---
 src/output_latex.cpp |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 784a9e5..3816e65 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1337,15 +1337,13 @@ void TeXOnePar(Buffer const & buf,
        }
 
        // Information about local language is stored as a font feature.
-       // If this is the last paragraph, and a local_font was set upon entering
-       // the inset and we're using "auto" or "default" encoding (and not
-       // compiling with LuaTeX), ensure the encoding is set back to the 
default
-       // encoding of the local language.
+       // If this is the last paragraph of the inset and a local_font was set 
upon entering
+       // and we are mixing encodings ("auto" or "default" and no XeTeX or 
LuaTeX),
+       // ensure the encoding is set back to the default encoding of the local 
language.
        if (runparams.isLastPar && runparams_in.local_font != 0
            && runparams_in.encoding != 
runparams_in.local_font->language()->encoding()
            && (bparams.inputenc == "auto" || bparams.inputenc == "default")
-               && runparams.flavor != OutputParams::LUATEX
-               && runparams.flavor != OutputParams::DVILUATEX
+               && !runparams.isFullUnicode()
           ) {
                runparams_in.encoding = 
runparams_in.local_font->language()->encoding();
                os << setEncoding(runparams_in.encoding->iconvName());