--- rxvt-unicode/src/init.C	2007/09/08 20:54:50	1.209
+++ rxvt-unicode/src/init.C	2007/09/12 21:06:08	1.212
@@ -201,18 +201,6 @@
   refresh_type = SLOW_REFRESH;
 
   oldcursor.row = oldcursor.col = -1;
-#ifdef HAVE_BG_PIXMAP
-#ifdef HAVE_AFTERIMAGE
-  bgPixmap.original_asim = NULL;
-#endif
-  /*  bgPixmap.w = bgPixmap.h = 0; */
-#ifdef XPM_BACKGROUND
-  bgPixmap.h_scale = bgPixmap.v_scale = 0;
-  bgPixmap.h_align = bgPixmap.v_align = 0;
-#endif
-  bgPixmap.flags = 0;
-  bgPixmap.pixmap = None;
-#endif
   last_bot = last_state = -1;
 
   set_option (Opt_scrollBar);
@@ -267,7 +255,6 @@
 rxvt_term::init_resources (int argc, const char *const *argv)
 {
   int i, r_argc;
-  char *val;
   const char **cmd_argv, **r_argv;
 
   /*
@@ -296,7 +283,7 @@
       cmd_argv[i] = NULL;
     }
 
-  rs[Rs_name] = rxvt_r_basename (argv[0]);
+  rs[Rs_name] = rxvt_basename (argv[0]);
 
   /*
    * Open display, get options/resources and create the window
@@ -349,7 +336,7 @@
   if (cmd_argv && cmd_argv[0])
     {
       if (!rs[Rs_title])
-        rs[Rs_title] = rxvt_r_basename (cmd_argv[0]);
+        rs[Rs_title] = rxvt_basename (cmd_argv[0]);
       if (!rs[Rs_iconName])
         rs[Rs_iconName] = rs[Rs_title];
     }
@@ -397,29 +384,19 @@
 #ifndef NO_BACKSPACE_KEY
   if (!rs[Rs_backspace_key])
 # ifdef DEFAULT_BACKSPACE
-    key_backspace = DEFAULT_BACKSPACE;
+    rs[Rs_backspace_key] = DEFAULT_BACKSPACE;
 # else
-    key_backspace = "DEC";       /* can toggle between \010 or \177 */
+    rs[Rs_backspace_key] = "DEC";       /* can toggle between \010 or \177 */
 # endif
-  else
-    {
-      val = strdup (rs[Rs_backspace_key]);
-      key_backspace = val;
-    }
 #endif
 
 #ifndef NO_DELETE_KEY
   if (!rs[Rs_delete_key])
 # ifdef DEFAULT_DELETE
-    key_delete = DEFAULT_DELETE;
+    rs[Rs_delete_key] = DEFAULT_DELETE;
 # else
-    key_delete = "\033[3~";
+    rs[Rs_delete_key] = "\033[3~";
 # endif
-  else
-    {
-      val = strdup (rs[Rs_delete_key]);
-      key_delete = val;
-    }
 #endif
 
 #ifdef HAVE_SCROLLBARS
@@ -640,7 +617,7 @@
     priv_modes |= PrivMode_smoothScroll;
 
 #ifndef NO_BACKSPACE_KEY
-  if (strcmp (key_backspace, "DEC") == 0)
+  if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
     priv_modes |= PrivMode_HaveBackSpace;
 #endif
 
@@ -1253,9 +1230,9 @@
   int er;
 
 #ifndef NO_BACKSPACE_KEY
-  if (key_backspace[0] && !key_backspace[1])
-    er = key_backspace[0];
-  else if (strcmp (key_backspace, "DEC") == 0)
+  if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
+    er = rs[Rs_backspace_key][0];
+  else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
     er = '\177';            /* the initial state anyway */
   else
 #endif
@@ -1388,7 +1365,7 @@
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
 
-      argv0 = (const char *)rxvt_r_basename (shell);
+      argv0 = (const char *)rxvt_basename (shell);
 
       if (option (Opt_loginShell))
         {