* w32fns.c (x_to_w32_font, w32_to_x_font, x_to_w32_weight) (w32_to_x_weight, w32_to_all_x_charsets): Remove obsolete functions. (w32_to_x_charset, x_to_w32_charset) (Qw32_charset_ansi, Qw32_charset_symbol, Qw32_charset_default) (Qw32_charset_shiftjis, Qw32_charset_hangeul, Qw32_charset_johab) (Qw32_charset_chinesebig5, Qw32_charset_gb2312, Qw32_charset_oem) (Qw32_charset_easteurope, Qw32_charset_turkish, Qw32_charset_baltic) (Qw32_charset_russian, Qw32_charset_arabic, Qw32_charset_greek) (Qw32_charset_hebrew, Qw32_charset_vietnamese, Qw32_charset_thai) (Qw32_charset_mac, Vw32_charset_info_alist): Move to w32font.c. (Qw32_charset_unicode): Remove. (syms_of_w32fns): Update for above changes. * w32font.c (w32_to_x_charset, x_to_w32_charset) (Qw32_charset_ansi, Qw32_charset_symbol, Qw32_charset_default) (Qw32_charset_shiftjis, Qw32_charset_hangeul, Qw32_charset_johab) (Qw32_charset_chinesebig5, Qw32_charset_gb2312, Qw32_charset_oem) (Qw32_charset_easteurope, Qw32_charset_turkish, Qw32_charset_baltic) (Qw32_charset_russian, Qw32_charset_arabic, Qw32_charset_greek) (Qw32_charset_hebrew, Qw32_charset_vietnamese, Qw32_charset_thai) (Qw32_charset_mac, Vw32_charset_info_alist): Move from w32fns.c. (syms_of_w32font): Update for above changes. * w32-fns.el (top-level): Unconditionally define all charsets.