--- rxvt-unicode/src/init.C	2007/05/01 21:30:01	1.182
+++ rxvt-unicode/src/init.C	2007/07/24 14:32:47	1.191
@@ -1,4 +1,4 @@
-/*----------------------------------------------------------------------*
+ /*----------------------------------------------------------------------*
  * File:        init.C
  *----------------------------------------------------------------------*
  *
@@ -48,7 +48,7 @@
     "rgb:00/00/00",             // 0: black             (Black)
     "rgb:cd/00/00",             // 1: red               (Red3)
     "rgb:00/cd/00",             // 2: green             (Green3)
-    "rgb:cd/cd/00",             // 3: ywlloe            (Yellow3)
+    "rgb:cd/cd/00",             // 3: yellow            (Yellow3)
     "rgb:00/00/cd",             // 4: blue              (Blue3)
     "rgb:cd/00/cd",             // 5: magenta           (Magenta3)
     "rgb:00/cd/cd",             // 6: cyan              (Cyan3)
@@ -185,7 +185,7 @@
   pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
 #endif
 
-#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
+#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
   pixmap = None;
 #endif
 
@@ -201,7 +201,6 @@
   saveLines = SAVELINES;
   numpix_colors = TOTAL_COLORS;
 
-  refresh_limit = 1;
   refresh_type = SLOW_REFRESH;
 
   oldcursor.row = oldcursor.col = -1;
@@ -216,10 +215,12 @@
   set_option (Opt_scrollBar);
   set_option (Opt_scrollTtyOutput);
   set_option (Opt_jumpScroll);
+  set_option (Opt_skipScroll);
   set_option (Opt_secondaryScreen);
   set_option (Opt_secondaryScroll);
   set_option (Opt_pastableTabs);
   set_option (Opt_intensityStyles);
+  set_option (Opt_iso14755_52);
 
   return true;
 }
@@ -317,6 +318,10 @@
     select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
 
+#ifdef HAVE_AFTERIMAGE
+  ::dpy = NULL ; /* init global var from libAfter... */
+  asv = AFTERIMAGE_DPY_OP (create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL));
+#endif
   free (r_argv);
 
   for (int i = NUM_RESOURCES; i--; )
@@ -1037,7 +1042,10 @@
 
 #ifdef XPM_BACKGROUND
   if (rs[Rs_backgroundPixmap] != NULL
-      && !option (Opt_transparent))
+#ifndef HAVE_AFTERIMAGE  
+      && !option (Opt_transparent)
+#endif	  
+    )
     {
       const char *p = rs[Rs_backgroundPixmap];