--- rxvt-unicode/src/init.C	2007/06/18 12:53:26	1.187
+++ rxvt-unicode/src/init.C	2007/08/02 15:01:30	1.197
@@ -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
 
@@ -215,6 +215,7 @@
   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);
@@ -317,6 +318,9 @@
     select_visual (strtol (rs[Rs_depth], 0, 0));
 #endif
 
+#ifdef HAVE_AFTERIMAGE
+  asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
+#endif
   free (r_argv);
 
   for (int i = NUM_RESOURCES; i--; )
@@ -880,7 +884,7 @@
   XClassHint classHint;
   XWMHints wmHint;
 #if ENABLE_FRILLS
-  MWMHints mwmhints;
+  MWMHints mwmhints = { };
 #endif
   XGCValues gcvalue;
   XSetWindowAttributes attributes;
@@ -1036,11 +1040,7 @@
   vt_ev.start (display, vt);
 
 #ifdef XPM_BACKGROUND
-  if (rs[Rs_backgroundPixmap] != NULL
-#ifndef HAVE_AFTERIMAGE  
-      && !option (Opt_transparent)
-#endif	  
-    )
+  if (rs[Rs_backgroundPixmap] != NULL)
     {
       const char *p = rs[Rs_backgroundPixmap];