]> git.lyx.org Git - lyx.git/commitdiff
Use || instead of or operator
authorJean-Marc Lasgouttes <lasgouttes@lyx.org>
Thu, 28 Feb 2019 11:03:34 +0000 (12:03 +0100)
committerJean-Marc Lasgouttes <lasgouttes@lyx.org>
Thu, 28 Feb 2019 11:03:34 +0000 (12:03 +0100)
It is more consistent and visual studio seems to dislike it anyway.

src/BufferParams.cpp

index 60bfa3ab2226ad9d241c23776bea5ac5157c16bb..fc4ac4a2c8d8a46b1de66773f2581ae5123b9d90 100644 (file)
@@ -3290,7 +3290,7 @@ void BufferParams::writeEncodingPreamble(otexstream & os,
                        break;
                }
        }
-       if (inputenc == "default" or features.isRequired("japanese")) {
+       if (inputenc == "default" || features.isRequired("japanese")) {
                // don't default to [utf8]{inputenc} with TeXLive >= 18
                os << "\\ifdefined\\UseRawInputEncoding\n";
                os << "  \\UseRawInputEncoding\\fi\n";