[LyX/master] Set the logic straight

[Juergen Spitzmueller]

commit d9626ec6af6b1fcf46cf92e5835fc38201a03ff1
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sun Mar 15 10:38:37 2015 +0100

    Set the logic straight

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 403da2f..978bc50 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";