*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 45fa342766ff6a54fff3f6cf378d5ce51b6a47a6..23925b724526e2ee364b91d0f1f6d93ebe255805 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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