diff options
| author | Jason Rumney <jasonr@gnu.org> | 2008-06-27 22:33:12 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2008-06-27 22:33:12 +0000 |
| commit | 57016d374732f49ed83bde7dd60a71b0155d7e48 (patch) | |
| tree | b1478f86506b48b1a9d9405799c654a02dee889b /lisp/w32-fns.el | |
| parent | 13ac2398ff34ce51d1f3b7cafa2aea9af99cf203 (diff) | |
| download | emacs-57016d374732f49ed83bde7dd60a71b0155d7e48.tar.gz | |
* 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.
Diffstat (limited to 'lisp/w32-fns.el')
| -rw-r--r-- | lisp/w32-fns.el | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 8ee9d490bb6..e524e530277 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -376,26 +376,22 @@ bit output with no translation." (w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil) (w32-add-charset-info "ms-oem" 'w32-charset-oem 437) (w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850) -(if (boundp 'w32-extra-charsets-defined) - (progn - (w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592) - (w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593) - (w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594) - (w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596) - (w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597) - (w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255) - (w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254) - (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257) - (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866) - (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595) - (w32-add-charset-info "tis620" 'w32-charset-thai 874) - (w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258) - (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361) - (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000))) -(if (boundp 'w32-unicode-charset-defined) - (progn - (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t)) - (w32-add-charset-info "iso10646-1" 'w32-charset-default t)) +(w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592) +(w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593) +(w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594) +(w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596) +(w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597) +(w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255) +(w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254) +(w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257) +(w32-add-charset-info "koi8-r" 'w32-charset-russian 20866) +(w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595) +(w32-add-charset-info "tis620" 'w32-charset-thai 874) +(w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258) +(w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361) +(w32-add-charset-info "mac-roman" 'w32-charset-mac 10000))) +(w32-add-charset-info "iso10646-1" 'w32-charset-default t)) + ;; ;; If unicode windows charset is not defined, use ansi fonts. ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) |