--- rxvt-unicode/src/init.C	2004/02/24 16:25:44	1.36
+++ rxvt-unicode/src/init.C	2004/03/14 23:14:39	1.40
@@ -386,21 +386,10 @@
   TermWin.saveLines = SAVELINES;
   numPixColors = TOTAL_COLORS;
 
-#ifndef NO_NEW_SELECTION
-  selection_style = NEW_SELECT;
-#else
-  selection_style = OLD_SELECT;
-#endif
-
 #ifndef NO_BRIGHTCOLOR
   colorfgbg = DEFAULT_RSTYLE;
 #endif
 
-#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
-  ks_bigfont = XK_greater;
-  ks_smallfont = XK_less;
-#endif
-
   refresh_limit = 1;
   refresh_type = SLOW_REFRESH;
   prev_nrow = prev_ncol = 0;
@@ -594,18 +583,6 @@
   if (!rs[Rs_cutchars])
     rs[Rs_cutchars] = CUTCHARS;
 
-#ifdef ACS_ASCII
-  if (!rs[Rs_acs_chars])
-    rs[Rs_acs_chars] = ACS_CHARS;
-  if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
-    {
-      val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
-      for (; i < 0x20; )
-        val[i] = ' ';
-      rs[Rs_acs_chars] = val;
-    }
-#endif
-
 #ifndef NO_BACKSPACE_KEY
   if (!rs[Rs_backspace_key])
 # ifdef DEFAULT_BACKSPACE
@@ -643,18 +620,6 @@
       rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
     }
 
-  if (rs[Rs_selectstyle])
-    {
-      if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
-        selection_style = OLD_WORD_SELECT;
-#ifndef NO_OLD_SELECTION
-
-      else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
-        selection_style = OLD_SELECT;
-#endif
-
-    }
-
 #ifdef HAVE_SCROLLBARS
   setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
                    rs[Rs_scrollBar_thickness]);
@@ -1169,7 +1134,7 @@
   xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
 
   classHint.res_name = (char *)rs[Rs_name];
-  classHint.res_class = (char *)APL_CLASS;
+  classHint.res_class = (char *)RESCLASS;
 
   wmHint.flags = (InputHint | StateHint | WindowGroupHint);
   wmHint.input = True;
@@ -1242,12 +1207,12 @@
   if (menuBar_height ())
     {
       menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
-                                        window_vt_x, 0,
-                                        TermWin_TotalWidth (),
-                                        menuBar_TotalHeight (),
-                                        0,
-                                        PixColors[Color_fg],
-                                        PixColors[Color_scroll]);
+                                         window_vt_x, 0,
+                                         TermWin_TotalWidth (),
+                                         menuBar_TotalHeight (),
+                                         0,
+                                         PixColors[Color_fg],
+                                         PixColors[Color_scroll]);
 
 #ifdef DEBUG_X
       XStoreName (display->display, menuBar.win, "menubar");