--- rxvt-unicode/src/xdefaults.C	2012/07/01 21:32:10	1.172
+++ rxvt-unicode/src/xdefaults.C	2014/05/02 20:35:00	1.176
@@ -113,7 +113,7 @@
               BOOL (Rs_scrollTtyOutput, NULL, "si",  Opt_scrollTtyOutput, Optflag_Reverse, "scroll-on-tty-output inhibit"),
               BOOL (Rs_scrollTtyKeypress, "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress, 0, "scroll-on-keypress"),
               BOOL (Rs_scrollWithBuffer, "scrollWithBuffer", "sw", Opt_scrollWithBuffer, 0, "scroll-with-buffer"),
-#if ENABLE_TRANSPARENCY
+#if BG_IMAGE_FROM_ROOT
               BOOL (Rs_transparent, "inheritPixmap", "ip", Opt_transparent, 0, "inherit parent pixmap"),
               BOOL (Rs_transparent, "transparent", "tr", Opt_transparent, 0, "inherit parent pixmap"),
               STRG (Rs_color + Color_tint, "tintColor", "tint", "color", "tint color"),
@@ -197,9 +197,9 @@
 #if BG_IMAGE_FROM_FILE
               RSTRG (Rs_path, "path", "search path"),
               STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
-# if ENABLE_EWMH
+#endif
+#if ENABLE_EWMH
               STRG (Rs_iconfile, "iconFile", "icon", "file", "path to application icon image"),
-# endif
 #endif
               /* fonts: command-line option = resource name */
               STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
@@ -650,7 +650,7 @@
     ;
 
   last--;
-  term->parse_keysym (XrmQuarkToString (quarks[last]), (char *)value->addr);
+  term->bind_action (XrmQuarkToString (quarks[last]), (char *)value->addr);
   return False;
 }
 
@@ -695,7 +695,7 @@
 };
 
 int
-rxvt_term::parse_keysym (const char *str, const char *arg)
+rxvt_term::bind_action (const char *str, const char *arg)
 {
   int sym;
   unsigned int state = 0;
@@ -744,7 +744,7 @@
 
   wchar_t *ws = rxvt_mbstowcs (arg);
   if (!HOOK_INVOKE ((this, HOOK_REGISTER_COMMAND, DT_INT, sym, DT_INT, state, DT_WCS_LEN, ws, wcslen (ws), DT_END)))
-    keyboard->register_user_translation (sym, state, ws);
+    keyboard->register_action (sym, state, ws);
 
   free (ws);
   return 1;