[Emacs-diffs] trunk r115383: In x_new_font calculate new frame sizes from new font size (Bug#16028).

[Martin Rudalics]

------------------------------------------------------------
revno: 115383
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Thu 2013-12-05 14:46:30 +0100
message:
  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).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32term.c                  w32term.c-20091113204419-o5vbwnq5f7feedwu-950
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-04 22:10:46 +0000
+++ b/src/ChangeLog     2013-12-05 13:46:30 +0000
@@ -1,3 +1,9 @@
+2013-12-05  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * lisp.h (FOR_EACH_TAIL): New macro.

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2013-11-30 15:51:16 +0000
+++ b/src/w32term.c     2013-12-05 13:46:30 +0000
@@ -5479,8 +5479,8 @@
         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.  */

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-12-04 14:11:33 +0000
+++ b/src/xterm.c       2013-12-05 13:46:30 +0000
@@ -7725,7 +7725,8 @@
         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