# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1090444079 0
# Node ID 83d7fd93f20849f12db1d9f0c53dcb1512ebcc8e
# Parent  d25b6aeb9747787223b4de5d115fee4d93c84ba0
*** empty log message ***

diff -r d25b6aeb9747 -r 83d7fd93f208 src/ChangeLog
--- a/src/ChangeLog	Wed Jul 21 19:18:29 2004 +0000
+++ b/src/ChangeLog	Wed Jul 21 21:07:59 2004 +0000
@@ -1,3 +1,22 @@
+2004-07-21  Kim F. Storm  <storm@cua.dk>
+
+	* window.h (struct glyph_matrix): New members nrows_scale_factor
+	and ncols_scale_factor.
+
+	* window.c (make_window): Initialize nrows_scale_factor and
+	ncols_scale_factor members.
+
+	* dispnew.c (margin_glyphs_to_reserve): Apply ncols_scale_factor.
+	(allocate_matrices_for_frame_redisplay): Fix left/right margin mix-up.
+	(required_matrix_height): Apply nrows_scale_factor.
+	(required_matrix_width): Apply ncols_scale_factor.
+
+	* xdisp.c (display_line): Increment nrows_scale_factor and set
+	fonts_changed_p if past last allocated row.
+	(append_glyph, append_composite_glyph, produce_image_glyph)
+	(append_stretch_glyph): Increment ncols_scale_factor and set
+	fonts_changed_p if current area is full.
+
 2004-07-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* widget.c (EmacsFrameDestroy): Don't abort if normal_gc is 0.