* window.c (window_min_size_1): Ensure room for the scroll bar and

	fringes.

diff --git a/src/ChangeLog b/src/ChangeLog
index 53fa7465ac5b86d3a5671d4df194919c599ce711..edaa7af421962affa708078df1b0bbfedd9b657f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/window.c b/src/window.c
index d1374f3d0d3e8f6c4fa8b884bc729a78344d912e..e7040e3c496513374235b2a29ed38bc907ff8c39 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -2568,7 +2568,10 @@ window_min_size_1 (w, width_p)
   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)