2 files changed, 11 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8286648aca1..40d4b1f57c4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-23  Jason Rumney  <jasonr@gnu.org>
+
+        * fontset.c (syms_of_fontset) [WINDOWSNT]: Special case for
+        ASCII font of default fontset on Windows.
+
+        * w32term.c (VCENTER_BASELINE_OFFSET): Bias division (see
+        xterm.c comment below).
+
+        * w32fns.c (x_to_w32_font): Initialize dpi from dpyinfo->resy.
+
 2000-10-23  Gerd Moellmann  <gerd@gnu.org>
 
         * xterm.c (x_connection_closed): Reset handling_signal.
diff --git a/src/w32term.c b/src/w32term.c
index d6bff6e32e4..23cde3c0522 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1915,7 +1915,7 @@ x_produce_stretch_glyph (it)
 
 #define VCENTER_BASELINE_OFFSET(FONT, F)                        \
  (FONT_DESCENT (FONT)                                           \
-  + (FRAME_LINE_HEIGHT ((F)) - FONT_HEIGHT ((FONT))) / 2        \
+  + (FRAME_LINE_HEIGHT ((F)) + 1 - FONT_HEIGHT ((FONT))) / 2    \
   - (FONT_DESCENT (FRAME_FONT (F)) - FRAME_BASELINE_OFFSET (F)))
 
 /* Produce glyphs/get display metrics for the display element IT is