--- rxvt-unicode/src/init.C	2007/11/15 11:36:15	1.222
+++ rxvt-unicode/src/init.C	2007/12/11 11:39:06	1.225
@@ -855,13 +855,10 @@
       int i = atoi (rs[Rs_color + idx]);
 
       if (i >= 8 && i <= 15)
-        {        /* bright colors */
-          i -= 8;
-          rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
-          return;
-        }
-
-      if (i >= 0 && i <= 7)   /* normal colors */
+        /* bright colors */
+        rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i - 8];
+      else if (i >= 0 && i <= 7)
+        /* normal colors */
         rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
     }
 }
@@ -1231,7 +1228,6 @@
    * Debugging
    */
 #ifdef DEBUG_TTYMODE
-#ifdef HAVE_TERMIOS_H
   /* c_iflag bits */
   fprintf (stderr, "Input flags\n");
 
@@ -1304,7 +1300,6 @@
 
   fprintf (stderr, "\n");
 # undef FOO
-# endif /* HAVE_TERMIOS_H */
 #endif /* DEBUG_TTYMODE */
 }
 
@@ -1418,7 +1413,8 @@
   char *login;
 
   if (option (Opt_console))
-    {     /* be virtual console, fail silently */
+    {
+      /* be virtual console, fail silently */
 #ifdef TIOCCONS
       unsigned int on = 1;