--- rxvt-unicode/src/init.C	2008/01/19 13:05:55	1.240
+++ rxvt-unicode/src/init.C	2008/01/27 16:52:13	1.245
@@ -12,7 +12,7 @@
  * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
  * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
  *                              - extensive modifications
- * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -269,10 +269,12 @@
 #ifdef OPTION_HC
     NULL,
 #endif
-#ifdef KEEP_SCROLLCOLOR
+#ifdef HAVE_SCROLLBARS
     COLOR_SCROLLBAR,
+#endif
+#ifdef RXVT_SCROLLBAR
     COLOR_SCROLLTROUGH,
-#endif /* KEEP_SCROLLCOLOR */
+#endif
 #if ENABLE_TRANSPARENCY
     NULL,
 #endif
@@ -310,6 +312,7 @@
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
   set_option (Opt_iso14755_52);
+  set_option (Opt_buffered);
 }
 
 static void
@@ -317,13 +320,8 @@
 {
   int i;
 
-  /*
-   * Close all unused file descriptors
-   * We don't want them, we don't need them.
-   */
   if ((i = open ("/dev/null", O_RDONLY)) < 0)
     {
-      /* TODO: BOO HISS */
       dup2 (STDERR_FILENO, STDIN_FILENO);
     }
   else if (i != STDIN_FILENO)
@@ -333,17 +331,6 @@
     }
 
   dup2 (STDERR_FILENO, STDOUT_FILENO);
-
-#if 0 // schmorp sayz closing filies is murder
-  for (i = STDERR_FILENO + 1; i < num_fds; i++)
-    {
-#ifdef __sgi                    /* Alex Coventry says we need 4 & 7 too */
-      if (i == 4 || i == 7)
-        continue;
-#endif
-      close (i);
-    }
-#endif
 }
 
 /*----------------------------------------------------------------------*/
@@ -925,7 +912,7 @@
    * The calculations of topShadow/bottomShadow values are adapted
    * from the fvwm window manager.
    */
-#ifdef KEEP_SCROLLCOLOR
+#ifdef RXVT_SCROLLBAR
   if (depth <= 2)
     {
       /* Monochrome */
@@ -950,7 +937,7 @@
                        ))
         alias_color (Color_topShadow, Color_White);
     }
-#endif /* KEEP_SCROLLCOLOR */
+#endif
 
 #ifdef OFF_FOCUS_FADING
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)