--- rxvt-unicode/src/command.C	2007/06/30 18:10:41	1.336
+++ rxvt-unicode/src/command.C	2007/08/03 14:03:28	1.339
@@ -521,7 +521,7 @@
             }
           else
             {
-# if ENABLE_OVERLAY
+# if ISO_14755
               scr_overlay_off ();
 # endif
               iso14755buf = 0;
@@ -532,7 +532,7 @@
         if (!(iso14755buf & ISO_14755_STARTED))
           {
             iso14755buf |= ISO_14755_STARTED;
-# if ENABLE_OVERLAY
+# if ISO_14755
             scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
             scr_overlay_set (0, 0, "ISO 14755 mode");
 # endif
@@ -730,7 +730,7 @@
                     strcpy (kbuf, "\033[1~");
                     break;
 
-#ifdef XK_KP_End
+#ifdef XK_KP_Insert
                   case XK_KP_Insert:
                     /* allow shift to override */
                     if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
@@ -936,7 +936,7 @@
   if (iso14755buf)
     if (iso14755buf & ISO_14755_52)
       {
-# if ENABLE_OVERLAY
+# if ISO_14755
         scr_overlay_off ();
 # endif
 # if ISO_14755
@@ -969,7 +969,7 @@
       }
     else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
       {
-# if ENABLE_OVERLAY
+# if ISO_14755
         scr_overlay_off ();
 # endif
         if (iso14755buf & ISO_14755_51)
@@ -1781,7 +1781,7 @@
       if (iso14755buf)
         {
           iso14755buf = 0;
-# if ENABLE_OVERLAY
+# if ISO_14755
           scr_overlay_off ();
 # endif
         }
@@ -3445,15 +3445,14 @@
         break;
 #endif
 
+#if XPM_BACKGROUND
       case Rxvt_Pixmap:
         {
           if (*str != ';')
             {
-#if XPM_BACKGROUND
               scale_pixmap ("");	/* reset to default scaling */
               set_bgPixmap (str);	/* change pixmap */
               scr_touch (true);
-#endif
             }
 
           int changed = 0;
@@ -3461,17 +3460,13 @@
           while ((str = strchr (str, ';')) != NULL)
             {
               str++;
-#if XPM_BACKGROUND
               changed += scale_pixmap (str);
-#endif
             }
 
           if (changed)
             {
-#ifdef XPM_BACKGROUND
               resize_pixmap ();
               scr_touch (true);
-#endif
             }
 #if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
           if (option (Opt_transparent))
@@ -3479,6 +3474,7 @@
 #endif
         }
         break;
+#endif
 
       case Rxvt_restoreFG:
         set_window_color (Color_fg, str);