--- rxvt-unicode/src/command.C	2007/06/18 13:38:12	1.331
+++ rxvt-unicode/src/command.C	2007/06/26 09:55:22	1.333
@@ -1037,7 +1037,7 @@
 {
   flush_ev.stop ();
 
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
   if (want_full_refresh)
     {
       want_full_refresh = 0;
@@ -1501,7 +1501,7 @@
 
             HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
 
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
             if (option (Opt_transparent))
               check_our_parents ();
 #endif
@@ -1545,11 +1545,11 @@
         HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
         break;
 
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
       case ReparentNotify:
         rootwin_cb (ev);
         break;
-#endif				/* TRANSPARENT */
+#endif				/* ENABLE_TRANSPARENCY */
 
       case GraphicsExpose:
       case Expose:
@@ -1583,7 +1583,7 @@
                 scrollbar_show (0);
               }
 
-#ifdef TRANSPARENT
+#ifdef ENABLE_TRANSPARENCY
             if (am_transparent && ev.xany.window == parent[0])
               XClearWindow (dpy, ev.xany.window);
 #endif
@@ -1822,7 +1822,7 @@
 #endif
 }
 
-#if TRANSPARENT || ENABLE_PERL
+#if ENABLE_TRANSPARENCY || ENABLE_PERL
 void
 rxvt_term::rootwin_cb (XEvent &ev)
 {
@@ -1832,7 +1832,7 @@
       && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
     return;
 
-# if TRANSPARENT
+# if ENABLE_TRANSPARENCY
   switch (ev.type)
     {
       case PropertyNotify:
@@ -2576,7 +2576,7 @@
       case 0x9b: 	/* CSI */
         process_csi_seq ();
         break;
-      case 0x9d: 	/* CSI */
+      case 0x9d: 	/* OSC */
         process_osc_seq ();
         break;
 #endif
@@ -3437,7 +3437,7 @@
         process_color_seq (op, Color_IT, str, resp);
         break;
 #endif
-#if TRANSPARENT && TINTING
+#if ENABLE_TRANSPARENCY && TINTING
       case URxvt_Color_tint:
         process_color_seq (op, Color_tint, str, resp);
 
@@ -3477,7 +3477,7 @@
               scr_touch (true);
 #endif
             }
-#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
+#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
           if (option (Opt_transparent))
             check_our_parents ();
 #endif