From: Martin Rudalics <rudalics@gmx.at>
Date: Tue, 13 Jan 2015 08:10:05 +0000 (+0100)
Subject: In adjust_frame_size don't return too early after font size change.
X-Git-Tag: emacs-25.0.90~2603^2~19
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=233dcf127dfccea422d9d75e18d5b1383d4c2c62;p=emacs.git

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).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 48c7370cade..00068d4330c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-13  Martin Rudalics  <rudalics@gmx.at>
+
+	* 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  <dmantipov@yandex.ru>
 
 	Add DEFUN attributes.
diff --git a/src/frame.c b/src/frame.c
index f138db9cecc..ec580f37c5b 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);