From 3a54f4a873e4fc24abc7da81bbef6a4d15e6d12d Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 28 Feb 2019 12:03:34 +0100
Subject: [PATCH] Use || instead of or operator

It is more consistent and visual studio seems to dislike it anyway.
---
 src/BufferParams.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 60bfa3ab22..fc4ac4a2c8 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -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";
-- 
2.39.5