[LyX/2.4.x] Do not check for diverging input encoding if the files use XeTeX/LuaTeX

[Richard Kimberly Heck]

commit b295b39de12ff7e2106ac7a5d60c4d6524ab4614
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Tue Jul 2 16:59:28 2024 +0200

    Do not check for diverging input encoding if the files use XeTeX/LuaTeX
    
    Fixes the problem reported at
    https://marc.info/?l=lyx-users&m=171986173131406
    
    (cherry picked from commit 4ed8bfb974e9bf5c626f00f4a57989c64320a568)
---
 ANNOUNCE                    | 4 +++-
 src/insets/InsetInclude.cpp | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index d19f5c080d..46e63fd8e9 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -73,7 +73,7 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
-- Set cursor font after pasting to PassThru (e.g., ERT) inset (bug 12592).
+-Do not check for diverging input encoding if the files use XeTeX/LuaTeX
 
 - The g-brief and g-brief2 letter classes load babel internally. LyX now
   is aware of that.
@@ -97,6 +97,8 @@ What's new
 
 - Fix crash when deleting rows or columns from table.
 
+- Set cursor font after pasting to PassThru (e.g., ERT) inset (bug 12592).
+
 - Do not ask about unapplied changes if dialog has been closed.
 
 - Fix wrong position of conversion windows of the input method (bugs 11723,
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 92ec17169c..f4ecaae8a0 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -846,7 +846,8 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const
 				from_utf8(master_tf));
 			Alert::warning(_("Different use-non-TeX-fonts settings"), text, true);
 		} 
-		else if (tmp->params().inputenc != masterBuffer->params().inputenc) {
+		else if (!tmp->params().useNonTeXFonts // implies both files do not use non-tex fonts
+			 && tmp->params().inputenc != masterBuffer->params().inputenc) {
 			docstring text = bformat(_("Included file `%1$s'\n"
 				"uses input encoding \"%2$s\" [%3$s]\n"
 				"while parent file uses input encoding \"%4$s\" [%5$s]."),