In x_new_font calculate new frame sizes from new font size (Bug#16028).

* w32term.c (x_new_font):
* xterm.c (x_new_font): Calculate new frame size from new font
size (Bug#16028).

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a4da67..5aec264 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-05  Martin Rudalics  <rudalics@gmx.at>
+
+       * w32term.c (x_new_font):
+       * xterm.c (x_new_font): Calculate new frame size from new font
+       size (Bug#16028).
+
 2013-12-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * lisp.h (FOR_EACH_TAIL): New macro.

diff --git a/src/w32term.c b/src/w32term.c
index 7062545..42a11e1 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5479,8 +5479,8 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
         doing it because it's done in Fx_show_tip, and it leads to
         problems because the tip frame has no widget.  */
       if (NILP (tip_frame) || XFRAME (tip_frame) != f)
-       x_set_window_size (f, 0, FRAME_TEXT_WIDTH (f),
-                          FRAME_TEXT_HEIGHT (f), 1);
+       x_set_window_size (f, 0, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
+                          FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 1);
     }
 
   /* X version sets font of input methods here also.  */

diff --git a/src/xterm.c b/src/xterm.c
index 0dbc4ac..b1e773c 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7725,7 +7725,8 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
         doing it because it's done in Fx_show_tip, and it leads to
         problems because the tip frame has no widget.  */
       if (NILP (tip_frame) || XFRAME (tip_frame) != f)
-       x_set_window_size (f, 0, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 1);
+       x_set_window_size (f, 0, FRAME_COLS (f) * FRAME_COLUMN_WIDTH (f),
+                          FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 1);
     }
 
 #ifdef HAVE_X_I18N