Mercurial > emacs
comparison lisp/w32-fns.el @ 96385:01647003e227
* 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.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Fri, 27 Jun 2008 22:33:12 +0000 |
| parents | b4e36ff621b3 |
| children | 8a353ec4f1de |
comparison
equal
deleted
inserted
replaced
| 96384:59d141ae8c74 | 96385:01647003e227 |
|---|---|
| 374 (w32-add-charset-info "big5" 'w32-charset-chinesebig5 950) | 374 (w32-add-charset-info "big5" 'w32-charset-chinesebig5 950) |
| 375 (w32-add-charset-info "gb2312.1980" 'w32-charset-gb2312 936) | 375 (w32-add-charset-info "gb2312.1980" 'w32-charset-gb2312 936) |
| 376 (w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil) | 376 (w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil) |
| 377 (w32-add-charset-info "ms-oem" 'w32-charset-oem 437) | 377 (w32-add-charset-info "ms-oem" 'w32-charset-oem 437) |
| 378 (w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850) | 378 (w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850) |
| 379 (if (boundp 'w32-extra-charsets-defined) | 379 (w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592) |
| 380 (progn | 380 (w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593) |
| 381 (w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592) | 381 (w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594) |
| 382 (w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593) | 382 (w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596) |
| 383 (w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594) | 383 (w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597) |
| 384 (w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596) | 384 (w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255) |
| 385 (w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597) | 385 (w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254) |
| 386 (w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255) | 386 (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257) |
| 387 (w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254) | 387 (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866) |
| 388 (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257) | 388 (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595) |
| 389 (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866) | 389 (w32-add-charset-info "tis620" 'w32-charset-thai 874) |
| 390 (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595) | 390 (w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258) |
| 391 (w32-add-charset-info "tis620" 'w32-charset-thai 874) | 391 (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361) |
| 392 (w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258) | 392 (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000))) |
| 393 (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361) | 393 (w32-add-charset-info "iso10646-1" 'w32-charset-default t)) |
| 394 (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000))) | 394 |
| 395 (if (boundp 'w32-unicode-charset-defined) | |
| 396 (progn | |
| 397 (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t)) | |
| 398 (w32-add-charset-info "iso10646-1" 'w32-charset-default t)) | |
| 399 ;; ;; If unicode windows charset is not defined, use ansi fonts. | 395 ;; ;; If unicode windows charset is not defined, use ansi fonts. |
| 400 ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) | 396 ;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) |
| 401 | 397 |
| 402 ;; Prefered names | 398 ;; Prefered names |
| 403 (w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950) | 399 (w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950) |