# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1101040396 0
# Node ID 5ebca6762883f24e19d5e605a3c269ff05d9095c
# Parent  f353e02ac006b5f51190181d64b9a1cdfa824d4a
*** empty log message ***

diff -r f353e02ac006 -r 5ebca6762883 src/ChangeLog
--- a/src/ChangeLog	Sun Nov 21 06:31:10 2004 +0000
+++ b/src/ChangeLog	Sun Nov 21 12:33:16 2004 +0000
@@ -1,3 +1,12 @@
+2004-11-21  Kim F. Storm  <storm@cua.dk>
+
+	* xdisp.c (IT_EXPAND_MATRIX_WIDTH): New macro.  Do not
+	expand matrix width for overflow in zero-width area.
+	(append_glyph, append_composite_glyph, produce_image_glyph)
+	(append_stretch_glyph): Use it to avoid loop in redisplay.
+	(note_mode_line_or_margin_highlight): Don't let help-echo from
+	string override help-echo from image map.
+
 2004-11-20  Luc Teirlinck  <teirllm@auburn.edu>
 
 	* fns.c (Fyes_or_no_p): Call Fread_from_minibuffer with extra