--- rxvt-unicode/src/rxvttoolkit.C	2007/06/26 00:40:19	1.68
+++ rxvt-unicode/src/rxvttoolkit.C	2007/07/12 22:33:16	1.70
@@ -445,12 +445,6 @@
   screen = DefaultScreen     (dpy);
   root   = DefaultRootWindow (dpy);
 
-#ifdef HAVE_AFTERIMAGE
-  ::dpy = dpy; /* init global var from libAfter... */
-  asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen),
-                                XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL);
-#endif
-
   assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
   XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
 
@@ -561,6 +555,9 @@
               && xev.xproperty.atom == xa[XA_XIM_SERVERS])
             im_change_check ();
 #endif
+          if (xev.type == MappingNotify)
+            XRefreshKeyboardMapping (&xev.xmapping);
+
           for (int i = xw.size (); i--; )
             {
               if (!xw[i])