--- rxvt-unicode/src/init.C	2010/12/02 11:02:17	1.285
+++ rxvt-unicode/src/init.C	2011/01/23 12:28:47	1.291
@@ -145,7 +145,7 @@
 }
 #endif
 
-const char *const def_colorName[] =
+static const char *const def_colorName[] =
   {
     COLOR_FOREGROUND,
     COLOR_BACKGROUND,
@@ -814,7 +814,6 @@
 #ifdef HAVE_BG_PIXMAP
   {
     bgPixmap.set_target (this);
-    bgPixmap.invalidate ();
 
 #ifdef ENABLE_TRANSPARENCY
     if (option (Opt_transparent))
@@ -892,7 +891,6 @@
 void
 rxvt_term::init_env ()
 {
-  int i;
   char *val;
 
 #ifdef DISPLAY_IS_IP
@@ -916,8 +914,7 @@
   if (rs[Rs_display_name] == NULL)
     rs[Rs_display_name] = val;   /* use broken `:0' value */
 
-  i = strlen (val);
-  env_display = (char *)rxvt_malloc (i + 9);
+  env_display = (char *)rxvt_malloc (strlen (val) + 9);
 
   sprintf (env_display, "DISPLAY=%s", val);
 
@@ -1509,7 +1506,7 @@
 #endif
   };
 
-  XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
+  XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols));
 
 #if ENABLE_FRILLS
   if (rs[Rs_transient_for])