From: Kim F. Storm <storm@cua.dk>
Date: Sun, 21 Nov 2004 12:33:16 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~3782
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e1814672912cde8723b4bdeab694309442eb09c1;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 45fa342766f..23925b72452 100644
--- 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