--- rxvt-unicode/src/xdefaults.C	2007/08/03 23:32:14	1.111
+++ rxvt-unicode/src/xdefaults.C	2007/09/12 21:06:08	1.114
@@ -188,7 +188,7 @@
               STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
               STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
               STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
-#ifdef XPM_BACKGROUND
+#ifdef BG_IMAGE_FROM_FILE
               RSTRG (Rs_path, "path", "search path"),
               STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
 #endif
@@ -320,9 +320,6 @@
 #if OFF_FOCUS_FADING
                                     "fade,"
 #endif
-#if defined(XPM_BACKGROUND)
-                                    "XPM,"
-#endif
 #if defined(ENABLE_TRANSPARENCY)
                                     "transparent,"
                                     "tint,"
@@ -568,8 +565,7 @@
         }
       else
 #ifdef KEYSYM_RESOURCE
-        /* if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1)) */
-        if (rxvt_Str_match (opt, "keysym."))
+        if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
           {
             const char *str = argv[++i];
 
@@ -675,7 +671,8 @@
 
   if (arg == NULL)
     {
-      if ((n = rxvt_Str_match (str, "keysym.")) == 0)
+      n = sizeof ("keysym.") - 1;
+      if (strncmp (str, "keysym.", n))
         return 0;
 
       str += n;		/* skip `keysym.' */
@@ -758,8 +755,7 @@
       newarg = newargstr;
     }
 
-  rxvt_Str_trim (newarg);
-  if (*newarg == '\0' || (n = rxvt_Str_escaped (newarg)) == 0)
+  if (*newarg == '\0')
     return -1;
 
   keyboard->register_user_translation (sym, state, newarg);