2 files changed, 8 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 02211b271ff..d70fd85fb89 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-01  Jason Rumney  <jasonr@gnu.org>
+
+        * w32term.c (w32_text_out): Use s->font, for consistency with
+        callers.
+
 2003-12-30  Luc Teirlinck  <teirllm@auburn.edu>
 
         * print.c (Ferror_message_string): Add hyperlink in the docstring
diff --git a/src/w32term.c b/src/w32term.c
index d7248499c22..ac4e998fed9 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1121,9 +1121,9 @@ w32_text_out (s, x, y,chars,nchars)
      wchar_t * chars;
      int nchars;
 {
-  int charset_dim = w32_font_is_double_byte (s->gc->font) ? 2 : 1;
-  if (s->gc->font->bdf)
-    w32_BDF_TextOut (s->gc->font->bdf, s->hdc,
+  int charset_dim = w32_font_is_double_byte (s->font) ? 2 : 1;
+  if (s->font->bdf)
+    w32_BDF_TextOut (s->font->bdf, s->hdc,
                      x, y, (char *) chars, charset_dim,
                      nchars * charset_dim, 0);
   else if (s->first_glyph->font_type == UNICODE_FONT)