From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 23 Nov 2015 17:39:18 +0000 (+0100)
Subject: Move setting FRAME_WINDOW_SIZES_CHANGED to resize_frame_windows.
X-Git-Tag: emacs-25.0.90~679^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5749550ddde6c632e5a4f4a3dae3c488c94b02f;p=emacs.git

Move setting FRAME_WINDOW_SIZES_CHANGED to resize_frame_windows.

* src/frame.c (adjust_frame_size): Don't set
FRAME_WINDOW_SIZES_CHANGED here ...
* src/window.c (resize_frame_windows): ... but here, as suggested
by Stefan Monnier.  Also remove some dead code along the way.
---

diff --git a/src/frame.c b/src/frame.c
index 5bafc6ed8d9..c388986e351 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -518,7 +518,6 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit,
   if (new_windows_width != old_windows_width)
     {
       resize_frame_windows (f, new_windows_width, 1, 1);
-      FRAME_WINDOW_SIZES_CHANGED (f) = true;
 
       /* MSDOS frames cannot PRETEND, as they change frame size by
 	 manipulating video hardware.  */
@@ -544,7 +543,6 @@ adjust_frame_size (struct frame *f, int new_width, int new_height, int inhibit,
       || WINDOW_TOP_PIXEL_EDGE (r) != FRAME_TOP_MARGIN_HEIGHT (f))
     {
       resize_frame_windows (f, new_windows_height, 0, 1);
-      FRAME_WINDOW_SIZES_CHANGED (f) = true;
 
       /* MSDOS frames cannot PRETEND, as they change frame size by
 	 manipulating video hardware.  */
diff --git a/src/window.c b/src/window.c
index 753c4ab8123..9f6b489e74a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4064,37 +4064,6 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
 	    {
 	      window_resize_apply (r, horflag);
 	      window_pixel_to_total (r->frame, horflag ? Qt : Qnil);
-#if false /* Let's try without safe sizes and/or killing other windows.  */
-	    }
-	  else
-	    {
-	      /* Finally, try with "safe" minimum sizes.  */
-	      resize_root_window (root, delta, horflag ? Qt : Qnil, Qsafe,
-				  pixelwise ? Qt : Qnil);
-	      if (window_resize_check (r, horflag)
-		  && new_pixel_size == XINT (r->new_pixel))
-		{
-		  window_resize_apply (r, horflag);
-		  window_pixel_to_total (r->frame, horflag ? Qt : Qnil);
-		}
-	      else
-		{
-		  /* We lost.  Delete all windows but the frame's
-		     selected one.  */
-		  root = f->selected_window;
-		  Fdelete_other_windows_internal (root, Qnil);
-		  if (horflag)
-		    {
-		      XWINDOW (root)->total_cols = new_size;
-		      XWINDOW (root)->pixel_width = new_pixel_size;
-		    }
-		  else
-		    {
-		      XWINDOW (root)->total_lines = new_size;
-		      XWINDOW (root)->pixel_height = new_pixel_size;
-		    }
-		}
-#endif /* false */
 	    }
 	}
     }
@@ -4117,6 +4086,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
 	}
     }
 
+  FRAME_WINDOW_SIZES_CHANGED (f) = true;
   fset_redisplay (f);
 }