--- rxvt-unicode/src/xdefaults.C	2003/12/17 09:00:35	1.4
+++ rxvt-unicode/src/xdefaults.C	2003/12/18 00:38:07	1.6
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:	xdefaults.c
  *----------------------------------------------------------------------*
- * $Id: xdefaults.C,v 1.4 2003/12/17 09:00:35 pcg Exp $
+ * $Id: xdefaults.C,v 1.6 2003/12/18 00:38:07 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1994      Robert Nation <nation@rocket.sanders.lockheed.com>
@@ -187,19 +187,15 @@
 #if (MENUBAR_MAX)
     RSTRG(Rs_menu, "menu", "name[;tag]"),
 #endif
-#ifndef NO_BOLDFONT
-    STRG(Rs_boldFont, "boldFont", "fb", "fontname", "bold text font"),
-#endif
-    STRG(Rs_font + 0, "font", "fn", "fontname", "normal text font"),
+    STRG(Rs_font, "font", "fn", "fontname", "normal text font"),
 /* fonts: command-line option = resource name */
-#ifdef MULTICHAR_SET
-    STRG(Rs_multichar_encoding, "multichar_encoding", "km", "mode",
-	 "multichar encoding; mode = eucj|sjis|big5|gb|kr|noenc"),
-#endif				/* MULTICHAR_SET */
 #ifdef USE_XIM
     STRG(Rs_inputMethod, "inputMethod", "im", "name", "name of input method"),
     STRG(Rs_preeditType, "preeditType", "pt", "style",
 	 "input style: style = OverTheSpot|OffTheSpot|Root"),
+#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
+    STRG(Rs_imLocale, "imLocale", "imlocale", "string", "locale to use for input method"),
+#endif
 #endif				/* USE_XIM */
 #ifdef GREEK_SUPPORT
     STRG(Rs_greek_keyboard, "greek_keyboard", "grk", "mode",