Handle tool bar size changes after x_set_font.

* frame.c (x_set_font): Try to keep frame height and width
unchanged if tool bar size changes with new font.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8acca6cca3fc3cfadbad4009546cb920c82101c3..e8fa72caea022319a412ada4b72966e106883253 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,9 +1,14 @@
+2015-03-04  Martin Rudalics  <rudalics@gmx.at>
+
+       * frame.c (x_set_font): Try to keep frame height and width
+       unchanged if tool bar size changes with new font.
+
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>
 
        * search.c (find_newline): Avoid assertion violations in
        CHAR_TO_BYTE when a portion of the buffer was deleted and we look
        for newlines near the end of the buffer.  This happens in Rmail
-       hen JIT font-lock fontifies a newly displayed portion of the
+       when JIT font-lock fontifies a newly displayed portion of the
        buffer.
 
 2015-03-03  Eli Zaretskii  <eliz@gnu.org>

diff --git a/src/frame.c b/src/frame.c
index bac2b246ad921f2ebc299adee9a091ca7f05c6fc..aa07219d152d90cb21f8f2686afaad495c5d399e 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -3626,6 +3626,7 @@ x_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 #endif
   /* Recalculate toolbar height.  */
   f->n_tool_bar_rows = 0;
+  f->tool_bar_redisplayed_once = false;
 
   /* Ensure we redraw it.  */
   clear_current_matrices (f);