--- rxvt-unicode/src/rxvtperl.xs	2006/12/14 15:19:31	1.109
+++ rxvt-unicode/src/rxvtperl.xs	2007/05/01 21:10:04	1.113
@@ -52,8 +52,6 @@
 #undef ROW
 #define ROW(n) THIS->row_buf [LINENO (n)]
 
-typedef int CHAINED UNUSED;
-
 /////////////////////////////////////////////////////////////////////////////
 
 static wchar_t *
@@ -306,6 +304,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #define IOM_CLASS "urxvt"
+#define IOM_WARN rxvt_warn
 #include <iom_perl.h>
 
 /////////////////////////////////////////////////////////////////////////////
@@ -677,10 +676,6 @@
     const_iv (GrabModeSync),
     const_iv (GrabModeAsync),
 
-    const_iv (EVENT_NONE),
-    const_iv (EVENT_READ),
-    const_iv (EVENT_WRITE),
-
     const_iv (NoEventMask),
     const_iv (KeyPressMask),
     const_iv (KeyReleaseMask),
@@ -1481,17 +1476,14 @@
 rxvt_term::x_resource (const char *name)
 
 bool
-rxvt_term::option (U32 optval, int set = -1)
+rxvt_term::option (U8 optval, int set = -1)
 	CODE:
 {
-	RETVAL = THIS->options & optval;
+	RETVAL = THIS->option (optval);
 
         if (set >= 0)
           {
-            if (set)
-              THIS->options |= optval;
-            else
-              THIS->options &= ~optval;
+            THIS->set_option (optval, set);
 
             if (THIS->check_ev.is_active ()) // avoid doing this before START
               switch (optval)