(redisplay_tool_bar): Don't set fonts_changed_p if

window height hasn't changed.

diff --git a/src/ChangeLog b/src/ChangeLog
index a173016145745685be59a7be20628217bfd75aed..023fa5eb891ed0aacaa6ed9c072eba1aad885653 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-31  Gerd Moellmann  <gerd@gnu.org>
+
+       * xdisp.c (redisplay_tool_bar): Don't set fonts_changed_p if
+       window height hasn't changed.
+
 2000-10-31  Jason Rumney  <jasonr@gnu.org>
 
        * w32term.c (x_produce_glyphs): Handle composite characters.

diff --git a/src/xdisp.c b/src/xdisp.c
index ce6f500092726b4133020fc0e0d579a21383f81b..d5b16ec571ae2f391e90d676b20c810f1dc0047d 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7273,6 +7273,7 @@ redisplay_tool_bar (f)
        {
          extern Lisp_Object Qtool_bar_lines;
          Lisp_Object frame;
+         int old_height = XFASTINT (w->height);
          
          XSETFRAME (frame, f);
          clear_glyph_matrix (w->desired_matrix);
@@ -7280,7 +7281,8 @@ redisplay_tool_bar (f)
                                    Fcons (Fcons (Qtool_bar_lines,
                                                  make_number (nlines)),
                                           Qnil));
-         fonts_changed_p = 1;
+         if (XFASTINT (w->height) != old_height)
+           fonts_changed_p = 1;
        }
     }