# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1140301029 0
# Node ID 5d68b6ede0d14d44354b83b16cffe23bfe988cce
# Parent  18babada4b1ecec1bb26b8f0e3fb6589f927bda0
	* window.c (window_min_size_1): Ensure room for the scroll bar and
	fringes.

diff -r 18babada4b1e -r 5d68b6ede0d1 src/ChangeLog
--- a/src/ChangeLog	Sat Feb 18 18:39:31 2006 +0000
+++ b/src/ChangeLog	Sat Feb 18 22:17:09 2006 +0000
@@ -1,3 +1,8 @@
+2006-02-18  Chong Yidong  <cyd@stupidchicken.com>
+
+	* window.c (window_min_size_1): Ensure room for the scroll bar and
+	fringes.
+
 2006-02-17  Romain Francoise  <romain@orebokech.com>
 
 	* puresize.h (BASE_PURESIZE): Increment to 1200000.
diff -r 18babada4b1e -r 5d68b6ede0d1 src/window.c
--- a/src/window.c	Sat Feb 18 18:39:31 2006 +0000
+++ b/src/window.c	Sat Feb 18 22:17:09 2006 +0000
@@ -2568,7 +2568,10 @@
   else
     {
       if (width_p)
-	size = window_min_width;
+	size = max (window_min_width,
+		    (MIN_SAFE_WINDOW_WIDTH
+		     + WINDOW_FRINGE_COLS (w)
+		     + WINDOW_SCROLL_BAR_COLS (w)));
       else
 	{
 	  if (MINI_WINDOW_P (w)