# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1151796518 0
# Node ID fab9a5c143388ce4ae87bc5e93cac0f655db9028
# Parent  df35f095b799c8b569571907f6d619e35e83e3e6
*** empty log message ***

diff -r df35f095b799 -r fab9a5c14338 src/ChangeLog
--- a/src/ChangeLog	Fri Jun 30 22:41:43 2006 +0000
+++ b/src/ChangeLog	Sat Jul 01 23:28:38 2006 +0000
@@ -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