Fix bug #6364 with slow scrolling on MS-Windows with bitmap fonts.

 src/w32font.c (g_b_init_get_char_width_32_w): New static var.
 (globals_of_w32font): Zero it out.
 (GetCharWidth32W_Proc): New function pointer.
 (get_char_width_32_w): New function.
 (compute_metrics): If get_glyph_outline_w returns an error, try
 get_char_width_32_w before declaring a failure.  This avoids
 punishing raster (a.k.a. "bitmap") fonts by slowing down
 redisplay.

1 files changed, 10 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c05845cef71..668bba1e4ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,13 @@
-2013-11-29  Eli Zaretskii  <eliz@gnu.org>
+2013-11-29  Tom Seddon  <emacs@tomseddon.plus.com>  (tiny change)
+
+        * w32font.c (g_b_init_get_char_width_32_w): New static var.
+        (globals_of_w32font): Zero it out.
+        (GetCharWidth32W_Proc): New function pointer.
+        (get_char_width_32_w): New function.
+        (compute_metrics): If get_glyph_outline_w returns an error, try
+        get_char_width_32_w before declaring a failure.  This avoids
+        punishing raster (a.k.a. "bitmap") fonts by slowing down
+        redisplay.  (Bug#6364).
 
         * xdisp.c (clear_mouse_face): Don't invalidate the entire
         mouse-highlight info, just signal frame_up_to_date_hook that mouse