--- rxvt-unicode/src/main.C	2007/12/04 16:24:00	1.270
+++ rxvt-unicode/src/main.C	2007/12/11 18:00:07	1.276
@@ -40,9 +40,7 @@
 #include <csignal>
 #include <cstring>
 
-#ifdef HAVE_TERMIOS_H
 # include <termios.h>
-#endif
 
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
@@ -162,7 +160,7 @@
   cursor_blink_ev.set     <rxvt_term, &rxvt_term::cursor_blink_cb> (this);
 #endif
 #ifdef TEXT_BLINK
-  text_blink_ev.set       <rxvt_term, &rxvt_term::text_blink_cb>   (this);
+  text_blink_ev.set       <rxvt_term, &rxvt_term::text_blink_cb>   (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
 #endif
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
   cont_scroll_ev.set      <rxvt_term, &rxvt_term::cont_scroll_cb>  (this);
@@ -331,7 +329,7 @@
 void
 rxvt_term::destroy ()
 {
-  if (destroy_ev.active)
+  if (ev_is_active (&destroy_ev))
     return;
 
   HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
@@ -602,13 +600,7 @@
   /*
    * Catch a fatal signal and tidy up before quitting
    */
-  void
-  sig_term (ev::sig &w, int revents)
-  {
-    rxvt_emergency_cleanup ();
-    w.stop ();
-    kill (getpid (), w.signum);
-  }
+  void sig_term (ev::sig &w, int revents);
 
   sig_handlers ()
   {
@@ -617,6 +609,14 @@
   }
 } sig_handlers;
 
+void
+sig_handlers::sig_term (ev::sig &w, int revents)
+{
+  rxvt_emergency_cleanup ();
+  w.stop ();
+  kill (getpid (), w.signum);
+}
+
 char **rxvt_environ; // startup environment
 
 void
@@ -829,7 +829,7 @@
   (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
 
 #if 0
-  // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
+  // TIOCSWINSZ is supposed to do this automatically and correctly
   if (cmd_pid)               /* force through to the command */
     kill (-cmd_pid, SIGWINCH);
 #endif