--- rxvt-unicode/src/rxvtperl.xs	2006/12/14 17:22:04	1.110
+++ rxvt-unicode/src/rxvtperl.xs	2007/08/27 18:31:00	1.114
@@ -52,8 +52,6 @@
 #undef ROW
 #define ROW(n) THIS->row_buf [LINENO (n)]
 
-typedef int CHAINED UNUSED;
-
 /////////////////////////////////////////////////////////////////////////////
 
 static wchar_t *
@@ -77,12 +75,6 @@
 }
 
 static SV *
-new_ref (HV *hv, const char *klass)
-{
-  return sv_bless (newRV ((SV *)hv), gv_stashpv (klass, 1));
-}
-
-static SV *
 newSVptr (void *ptr, const char *klass)
 {
   HV *hv = newHV ();
@@ -306,6 +298,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #define IOM_CLASS "urxvt"
+#define IOM_WARN rxvt_warn
 #include <iom_perl.h>
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1404,7 +1397,6 @@
 	CODE:
 {
         wchar_t *wstr = sv2wcs (text);
-        int wlen = wcslen (wstr);
         int dlen = 0;
 
         // find length
@@ -1477,17 +1469,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)