2 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index e27fbf47666..d5fc0aca0b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
 2001-10-17  Andrew Innes  <andrewi@gnu.org>
 
+        * 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  <andrewi@gnu.org>
+
         * w32term.c (w32_read_socket): Determine clipping rectangle for
         the entire frame, including areas covered by scrollbars and the
         menubar.  This avoids internal arguments about whether a frame is
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.  */