From: Andrew Innes Date: Wed, 17 Oct 2001 17:48:44 +0000 (+0000) Subject: (w32_encode_char): Get cached codepage from font_info, X-Git-Tag: ttn-vms-21-2-B4~19381 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e804d381c40da55c61107dfeda336936e4ac845;p=emacs.git (w32_encode_char): Get cached codepage from font_info, rather than working it out by calling w32_codepage_for_font for every glyph. --- diff --git a/src/ChangeLog b/src/ChangeLog index e27fbf47666..d5fc0aca0b7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2001-10-17 Andrew Innes + + * fontset.h (struct font_info) [WINDOWSNT]: Add codepage field. + + * w32fns.c (w32_load_system_font): Cache codepage for font, in + font_info.charset field. + + * w32term.c (w32_encode_char): Get cached codepage from font_info, + rather than working it out by calling w32_codepage_for_font for + every glyph. + 2001-10-17 Andrew Innes * w32term.c (w32_read_socket): Determine clipping rectangle for diff --git a/src/w32term.c b/src/w32term.c index 0425ed44577..c8afc114ef1 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1438,7 +1438,7 @@ w32_encode_char (c, char2b, font_info, two_byte_p) *char2b = BUILD_WCHAR_T (sjis1, sjis2); } } - codepage = w32_codepage_for_font (font_info->name); + codepage = font_info->codepage; /* If charset is not ASCII or Latin-1, may need to move it into Unicode space. */