--- rxvt-unicode/src/xdefaults.C	2003/11/25 11:52:42	1.3
+++ rxvt-unicode/src/xdefaults.C	2004/01/16 22:26:18	1.7
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:	xdefaults.c
  *----------------------------------------------------------------------*
- * $Id: xdefaults.C,v 1.3 2003/11/25 11:52:42 pcg Exp $
+ * $Id: xdefaults.C,v 1.7 2004/01/16 22:26:18 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1994      Robert Nation <nation@rocket.sanders.lockheed.com>
@@ -143,7 +143,7 @@
     BOOL(Rs_cursorBlink, "cursorBlink", "bc", Opt_cursorBlink, "blinking cursor"),
 #endif
 #ifdef POINTER_BLANK
-    BOOL(Rs_pointerBlank, "pointerBlank", NULL, Opt_pointerBlank, NULL),
+    BOOL(Rs_pointerBlank, "pointerBlank", "pb", Opt_pointerBlank, "switch off pointer after delay"),
 #endif
     STRG(Rs_color + Color_bg, "background", "bg", "color", "background color"),
     STRG(Rs_color + Color_fg, "foreground", "fg", "color", "foreground color"),
@@ -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",
@@ -536,7 +532,7 @@
 		rxvt_parse_keysym(aR_ opt + sizeof("keysym.") - 1, str);
 	} else
 #endif
-          ;
+          bad_option = 1;
     }
 
     if (bad_option)
@@ -683,7 +679,7 @@
 
 		if (kw == NULL)
 		    continue;
-		n = STRLEN(kw);
+		n = STRLEN (kw);
 		if (str[n] == ':' && rxvt_Str_match(str, kw)) {
 		    /* skip `keyword:' */
 		    str += (n + 1);