# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1145831195 0
# Node ID ef912c974d3221e9d53e0680e47b2563f2a30eec
# Parent  874b926e482a0539d29cd2cb99c569dacefab3fa
*** empty log message ***

diff -r 874b926e482a -r ef912c974d32 src/ChangeLog
--- a/src/ChangeLog	Sun Apr 23 21:56:50 2006 +0000
+++ b/src/ChangeLog	Sun Apr 23 22:26:35 2006 +0000
@@ -1,3 +1,14 @@
+2006-04-24  Kim F. Storm  <storm@cua.dk>
+
+	* frame.c (x_set_font): Clear f->n_tool_bar_rows and current frame
+	matrices to force recalculation of tool-bar height after font change.
+
+	* xdisp.c (tool_bar_lines_needed): New local `temp_row' for clarity.
+	(tool_bar_lines_needed): Clear it when done, so we don't accidentally
+	draw a second copy of the tool-bar after resetting f->n_tool_bar_rows.
+	(redisplay_tool_bar): Update tool-bar-lines frame parameter whenever
+	we recalculate f->n_tool_bar_rows.
+
 2006-04-23  Lars Hansen  <larsh@soem.dk>
 
 	* editfns.c (find_field): Fix comment.