From d9626ec6af6b1fcf46cf92e5835fc38201a03ff1 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 15 Mar 2015 10:38:37 +0100
Subject: [PATCH] Set the logic straight

---
 src/BufferParams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 403da2fe6b..978bc50506 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2859,7 +2859,7 @@ void BufferParams::writeEncodingPreamble(otexstream & os,
 			// do not load inputenc if japanese is used
 			// or if the class provides inputenc
 			if (features.isRequired("japanese")
-			    && features.isProvided("inputenc"))
+			    || features.isProvided("inputenc"))
 				break;
 			os << "\\usepackage[" << from_ascii(encoding().latexName())
 			   << "]{inputenc}\n";