Mercurial > emacs

changeset 7618:45298374e242

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(change_window_height): Test for DELTA too small only after making it smaller based on maxdelta.
author Richard M. Stallman <rms@gnu.org>
date Sun, 22 May 1994 08:30:57 +0000
parents edc853e14f7b
children 078782db2675
files src/window.c
diffstat 1 files changed, 20 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/src/window.c	Sun May 22 07:59:39 1994 +0000
+++ b/src/window.c	Sun May 22 08:30:57 1994 +0000
@@ -1252,10 +1252,10 @@
 	    {
 	      struct window *best_window_ptr = XWINDOW (best_window);
 	      struct window *w_ptr = XWINDOW (w);
-	      if (NILP (best_window) ||
-		  (XFASTINT (w_ptr->height) * XFASTINT (w_ptr->width))
-		  > (XFASTINT (best_window_ptr->height)
-		     * XFASTINT (best_window_ptr->width)))
+	      if (NILP (best_window)
+		  || (XFASTINT (w_ptr->height) * XFASTINT (w_ptr->width)
+		      > (XFASTINT (best_window_ptr->height)
+			 * XFASTINT (best_window_ptr->width))))
 		best_window = w;
 	    }
 	    break;
@@ -2072,12 +2072,6 @@
 
   sizep = &CURSIZE (window);
 
-  if (*sizep + delta < MINSIZE (window))
-    {
-      Fdelete_window (window);
-      return;
-    }
-
   {
     register int maxdelta;
 
@@ -2093,13 +2087,19 @@
 	 the full frame, or make the only window aside from the
 	 minibuffer the full frame.  */
       delta = maxdelta;
-
-    if (delta == 0)
+  }
+
+  if (*sizep + delta < MINSIZE (window))
+    {
+      Fdelete_window (window);
       return;
-  }
-
-  if (!NILP (p->next) &&
-      (*sizefun) (p->next) - delta >= MINSIZE (p->next))
+    }
+
+  if (delta == 0)
+    return;
+
+  if (!NILP (p->next)
+      && (*sizefun) (p->next) - delta >= MINSIZE (p->next))
     {
       (*setsizefun) (p->next, (*sizefun) (p->next) - delta, 0);
       (*setsizefun) (window, *sizep + delta, 0);
@@ -2108,8 +2108,8 @@
 	 but it propagates the new top edge to its children */
       (*setsizefun) (p->next, (*sizefun) (p->next), 0);
     }
-  else if (!NILP (p->prev) &&
-	   (*sizefun) (p->prev) - delta >= MINSIZE (p->prev))
+  else if (!NILP (p->prev)
+	   && (*sizefun) (p->prev) - delta >= MINSIZE (p->prev))
     {
       (*setsizefun) (p->prev, (*sizefun) (p->prev) - delta, 0);
       CURBEG (window) -= delta;
@@ -2713,8 +2713,8 @@
 		  /* As documented in Fcurrent_window_configuration, don't
 		     save the location of point in the buffer which was current
 		     when the window configuration was recorded.  */
-		  if (!EQ (p->buffer, new_current_buffer) &&
-		      XBUFFER (p->buffer) == current_buffer)
+		  if (!EQ (p->buffer, new_current_buffer)
+		      && XBUFFER (p->buffer) == current_buffer)
 		    Fgoto_char (w->pointm);
 		}
 	      else if (NILP (w->buffer) || NILP (XBUFFER (w->buffer)->name))