--- rxvt-unicode/src/xdefaults.C 2003/12/18 00:29:29 1.5 +++ 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.5 2003/12/18 00:29:29 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 @@ -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,15 +187,8 @@ #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", @@ -539,7 +532,7 @@ rxvt_parse_keysym(aR_ opt + sizeof("keysym.") - 1, str); } else #endif - ; + bad_option = 1; } if (bad_option)