X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5372262fdcd2958d09df7708c58d413d225a508a..43ccb598c7fc2c5c0601c8f9869a6b6f7a78b121:/src/window.c

diff --git a/src/window.c b/src/window.c
index 88c8c81a90..d9c807ccf9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -22,13 +22,13 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 #include "lisp.h"
 #include "buffer.h"
+#include "keyboard.h"
 #include "frame.h"
 #include "window.h"
 #include "commands.h"
 #include "indent.h"
 #include "termchar.h"
 #include "disptab.h"
-#include "keyboard.h"
 #include "dispextern.h"
 #include "blockinput.h"
 #include "intervals.h"
@@ -1710,19 +1710,19 @@ window_loop (type, obj, mini, frames)
 
 	  case GET_LARGEST_WINDOW:
 	    {
-	      struct window *b;
-	      
 	      /* Ignore dedicated windows and minibuffers.  */
-	      if (MINI_WINDOW_P (w)
-		  || !NILP (w->dedicated)
-		  || NILP (best_window))
+	      if (MINI_WINDOW_P (w) || !NILP (w->dedicated))
 		break;
 	      
-	      b = XWINDOW (best_window);
-	      if (NILP (best_window)
-		  || (XFASTINT (w->height) * XFASTINT (w->width)
-		      > (XFASTINT (b->height) * XFASTINT (b->width))))
+	      if (NILP (best_window))
 		best_window = window;
+	      else
+		{
+		  struct window *b = XWINDOW (best_window);
+		  if (XFASTINT (w->height) * XFASTINT (w->width)
+		      > XFASTINT (b->height) * XFASTINT (b->width))
+		    best_window = window;
+		}
 	    }
 	    break;