From 81513a83cd5a50b659923bc4f3dfd7ea075c11e3 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 1 Feb 2012 09:17:56 +0000
Subject: [PATCH] "and" and "or" keywords aren't valid C++

---
 panda/src/rocket/rocketInputHandler.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/panda/src/rocket/rocketInputHandler.cxx b/panda/src/rocket/rocketInputHandler.cxx
index 387ce9d2d0..c77143f70e 100644
--- a/panda/src/rocket/rocketInputHandler.cxx
+++ b/panda/src/rocket/rocketInputHandler.cxx
@@ -242,7 +242,7 @@ do_transmit_data(DataGraphTraverser *trav, const DataNodeTransmit &input,
 
       case ButtonEvent::T_keystroke:
         // Ignore control characters; otherwise, they actually get added to strings in the UI.
-        if (be._keycode > 0x1F and (be._keycode < 0x7F or be._keycode > 0x9F)) {
+        if (be._keycode > 0x1F && (be._keycode < 0x7F || be._keycode > 0x9F)) {
           _text_input.push_back(be._keycode);
         }
         break;