From e85ee976fe1a85fbd4adda3d6f168e0bf1c6cc16 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 31 Oct 2000 12:53:56 +0000 Subject: [PATCH] (redisplay_tool_bar): Don't set fonts_changed_p if window height hasn't changed. --- src/ChangeLog | 5 +++++ src/xdisp.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a1730161457..023fa5eb891 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2000-10-31 Gerd Moellmann + + * xdisp.c (redisplay_tool_bar): Don't set fonts_changed_p if + window height hasn't changed. + 2000-10-31 Jason Rumney * w32term.c (x_produce_glyphs): Handle composite characters. diff --git a/src/xdisp.c b/src/xdisp.c index ce6f5000927..d5b16ec571a 100644 --- 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; } } -- 2.39.5