Merged from emacs@sv.gnu.org

[gnu-emacs] / src / frame.c

diff --git a/src/frame.c b/src/frame.c
index 988b1436936ce806ffef248f0af16423883ad3d5..04a663f93886b81ed43f9e81e3c3aa16c065b7ba 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -3399,6 +3399,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);
     }