From: Kim F. Storm <storm@cua.dk>
Date: Sun, 23 Apr 2006 22:26:58 +0000 (+0000)
Subject: (x_set_font): Clear f->n_tool_bar_rows and current frame
X-Git-Tag: emacs-pretest-22.0.90~2976
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca03f883c58cbb29e626eabadadcda684b4750e6;p=emacs.git

(x_set_font): Clear f->n_tool_bar_rows and current frame
matrices to force recalculation of tool-bar height after font change.
---

diff --git a/src/frame.c b/src/frame.c
index dd91e436600..c08d5a6f84d 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -3095,6 +3095,11 @@ x_set_font (f, arg, oldval)
       else if (!NILP (Fequal (result, oldval)))
         return;
 
+      /* Recalculate toolbar height.  */
+      f->n_tool_bar_rows = 0;
+      /* Ensure we redraw it.  */
+      clear_current_matrices (f);
+
       store_frame_param (f, Qfont, result);
       recompute_basic_faces (f);
     }