[Emacs-diffs] master 233dcf1: In adjust_frame_size don't return too early after font size change.

[Martin Rudalics]

branch: master
commit 233dcf127dfccea422d9d75e18d5b1383d4c2c62
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    In adjust_frame_size don't return too early after font size change.
    
    * frame.c (adjust_frame_size): Make sure new numbers of
    lines/columns get installed after font size change (Bug#19575).
---
 src/ChangeLog |    5 +++++
 src/frame.c   |    6 +++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 48c7370..00068d4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-13  Martin Rudalics  <address@hidden>
+
+       * frame.c (adjust_frame_size): Make sure new numbers of
+       lines/columns get installed after font size change (Bug#19575).
+
 2015-01-13  Dmitry Antipov  <address@hidden>
 
        Add DEFUN attributes.
diff --git a/src/frame.c b/src/frame.c
index f138db9..ec580f3 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -335,6 +335,8 @@ adjust_frame_size (struct frame *f, int new_width, int 
new_height, int inhibit,
   int unit_height = FRAME_LINE_HEIGHT (f);
   int old_pixel_width = FRAME_PIXEL_WIDTH (f);
   int old_pixel_height = FRAME_PIXEL_HEIGHT (f);
+  int old_cols = FRAME_COLS (f);
+  int old_lines = FRAME_LINES (f);
   int new_pixel_width, new_pixel_height;
   /* The following two values are calculated from the old frame pixel
      sizes and any "new" settings for tool bar, menu bar and internal
@@ -466,7 +468,9 @@ adjust_frame_size (struct frame *f, int new_width, int 
new_height, int inhibit,
       && new_windows_width == old_windows_width
       && new_windows_height == old_windows_height
       && new_pixel_width == old_pixel_width
-      && new_pixel_height == old_pixel_height)
+      && new_pixel_height == old_pixel_height
+      && new_cols == old_cols
+      && new_lines == old_lines)
     /* No change.  Sanitize window sizes and return.  */
     {
       sanitize_window_sizes (frame, Qt);