*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index 8289442da83da4a15dddbc2b0b8aa359c310b900..a6215ec38f1844f40fc0d0fa2b00a668c089f265 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2006-07-02  Kim F. Storm  <storm@cua.dk>
+
+       * xdisp.c (display_tool_bar_line): Skip glyphs which are too big
+       to ever fit the tool-bar,
+       (MAX_FRAME_TOOL_BAR_HEIGHT): New macro.
+       (tool_bar_lines_needed): Use unused mode-line row as temp_row.
+       (redisplay_tool_bar): Only clear desired matrix if we actually
+       change the tool-bar window height.  Only try to make the tool-bar
+       window bigger if there is actually room for it.
+
 2006-06-30  Ralf Angeli  <angeli@caeruleus.net>
 
        * w32term.c (x_make_frame_visible): Use SystemParametersInfo with