--- rxvt-unicode/src/rxvtperl.xs	2011/12/06 11:29:52	1.147
+++ rxvt-unicode/src/rxvtperl.xs	2012/04/11 10:20:00	1.153
@@ -25,11 +25,12 @@
 #include <perl.h>
 #include <XSUB.h>
 #undef line_t
+#undef bool // perl defines it's own bool type, except with g++... what a trap
 
 #include "../config.h"
 
-#include <cstddef>
-#include <cstdarg>
+#include <stddef.h>
+#include <stdarg.h>
 
 #include "unistd.h"
 
@@ -922,11 +923,10 @@
         rxvt_term *term = new rxvt_term;
 
 	stringvec *argv = new stringvec;
-	stringvec *envv = new stringvec;
-
         for (int i = 0; i <= AvFILL (arg); i++)
           argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
 
+	stringvec *envv = new stringvec;
         for (int i = AvFILL (env) + 1; i--; )
           envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
 
@@ -1102,13 +1102,6 @@
 	OUTPUT:
         RETVAL
 
-char *
-rxvt_term::locale ()
-	CODE:
-        RETVAL = THIS->locale;
-	OUTPUT:
-        RETVAL
-
 #define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
 
 #define TERM_OFFSET_width       TERM_OFFSET(width)
@@ -1553,7 +1546,7 @@
           {
             THIS->set_option (optval, set);
 
-            if (THIS->env_colorfgbg [0]) // avoid doing this before START
+            if (THIS->init_done) // avoid doing this before START
               switch (optval)
                 {
                   case Opt_skipBuiltinGlyphs:
@@ -1564,6 +1557,12 @@
                     THIS->refresh_check ();
                     break;
 
+#ifdef CURSOR_BLINK
+                  case Opt_cursorBlink:
+                    THIS->cursor_blink_reset ();
+                    break;
+#endif
+
                   case Opt_cursorUnderline:
                     THIS->want_refresh = 1;
                     THIS->refresh_check ();