[LyX/master] Preserve \inputencoding value when switching to non-TeX fonts.

[Günter Milde]

commit 71a57e0f4df9d2b860ec2d060cc30043206c335d
Author: Günter Milde <mi...@lyx.org>
Date:   Fri Jun 21 09:54:45 2019 +0200

    Preserve \inputencoding value when switching to non-TeX fonts.
    
    With non-TeX fonts, the \inputencoding setting is overridden
    by "utf8-plain" (pass-through). Keeping the old value allows
    switching back to TeX fonts without the need to (re)set
    the input encoding.
    
    Also change back the GUI name of the "auto-legacy" setting
    (cf. #11115).
---
 src/frontends/qt4/GuiDocument.cpp |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/frontends/qt4/GuiDocument.cpp 
b/src/frontends/qt4/GuiDocument.cpp
index 21a6948..008d074 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -967,7 +967,7 @@ GuiDocument::GuiDocument(GuiView & lv)
        langModule->languageCO->setModelColumn(0);
 
        langModule->encodingCO->addItem(qt_("Unicode (utf8)"));
-       langModule->encodingCO->addItem(qt_("Legacy (auto-selected)"));
+       langModule->encodingCO->addItem(qt_("Traditional (auto-selected)"));
        langModule->encodingCO->addItem(qt_("Custom"));
        langModule->encodingCO->setItemData(EncodingSets::unicode,
                "Select Unicode (utf8) encoding.", Qt::ToolTipRole);
@@ -3328,8 +3328,9 @@ void GuiDocument::applyView()
        // language & quotes
        switch (langModule->encodingCO->currentIndex()) {
                case EncodingSets::unicode: {
-                       bp_.inputenc = 
fromqstr(langModule->unicodeEncodingCO->itemData(
-                               
langModule->unicodeEncodingCO->currentIndex()).toString());
+                       if (!fontModule->osFontsCB->isChecked())
+                               bp_.inputenc = 
fromqstr(langModule->unicodeEncodingCO->itemData(
+                                       
langModule->unicodeEncodingCO->currentIndex()).toString());
                        break;
                }
                case EncodingSets::legacy: {