changeset 25255:29c5c79b1483

(set_window_height, set_window_width): If window starts out "too small", set its too_small_ok flag. If window's too_small_ok flag is set, don't delete it unless it is so small it would cause a crash.
author Gerd Moellmann <gerd@gnu.org>
date Fri, 13 Aug 1999 21:24:35 +0000
parents 518d62d71d21
children 631f514ef580
files src/window.c
diffstat 1 files changed, 23 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/window.c	Fri Aug 13 20:51:51 1999 +0000
+++ b/src/window.c	Fri Aug 13 21:24:35 1999 +0000
@@ -1929,9 +1929,21 @@
 
   check_min_window_sizes ();
 
+  /* If the window has been "too small" at one point,
+     don't delete it for being "too small" in the future.
+     Preserve it as long as that is at all possible.  */
+  if (oheight < window_min_height)
+    w->too_small_ok = Qt;
+
   if (!nodelete && !NILP (w->parent))
     {
-      int min_height = window_min_size (w, 0);
+      int min_height;
+
+      if (!MINI_WINDOW_P (w) && !NILP (w->too_small_ok))
+	min_height = MIN_SAFE_WINDOW_HEIGHT;
+      else
+	min_height = window_min_size (w, 0);
+      
       if (height < min_height)
 	{
 	  delete_window (window);
@@ -1998,7 +2010,16 @@
   int left, pos, lastright, opos, lastoright;
   Lisp_Object child;
 
-  if (!nodelete && width < window_min_width && !NILP (w->parent))
+  /* If the window has been "too small" at one point,
+     don't delete it for being "too small" in the future.
+     Preserve it as long as that is at all possible.  */
+  if (owidth < window_min_width)
+    w->too_small_ok = Qt;
+
+  if (!nodelete && !NILP (w->parent)
+      && (! NILP (w->too_small_ok)
+	  ? width < MIN_SAFE_WINDOW_WIDTH
+	  : width < window_min_width))
     {
       delete_window (window);
       return;