--- rxvt-unicode/src/main.C	2010/10/22 05:57:59	1.333
+++ rxvt-unicode/src/main.C	2010/12/07 19:47:02	1.338
@@ -363,6 +363,18 @@
   delete this;
 }
 
+void
+rxvt_term::set_option (uint8_t opt, bool set)
+{
+  if (!opt)
+    return;
+
+  uint8_t mask = 1 << (opt & 7);
+  uint8_t &val = options [opt >> 3];
+
+  val = val & ~mask | (set ? mask : 0);
+}
+
 /*----------------------------------------------------------------------*/
 /*
  * Exit gracefully, clearing the utmp entry and restoring tty attributes
@@ -513,6 +525,9 @@
 # ifdef VLNEXT
   tio->c_cc[VLNEXT] = CLNEXT;
 # endif
+# ifdef VSTATUS
+  tio->c_cc[VSTATUS] = CSTATUS;
+# endif
 
 # if VMIN != VEOF
   tio->c_cc[VMIN] = 1;
@@ -556,8 +571,6 @@
   dup2 (STDERR_FILENO, STDIN_FILENO);
   dup2 (STDERR_FILENO, STDOUT_FILENO);
 
-  ptytty::init ();
-
   if (!ev_default_loop ())
     rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
 
@@ -1628,7 +1641,6 @@
 {
   Window cr;
   XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
-/*  fprintf (stderr, "origin is %+d%+d\n", x, y);*/
 }
 
 Pixmap
@@ -1652,15 +1664,6 @@
 }
 
 #ifdef HAVE_BG_PIXMAP
-# if TRACE_PIXMAPS
-#  undef update_background
-void
-rxvt_term::trace_update_background (const char *file, int line)
-{
-  fprintf (stderr, "%s:%d:update_background()\n", file, line);
-  update_background ();
-}
-# endif
 
 void
 rxvt_term::update_background ()