summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/window.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 53fa7465ac5..edaa7af4219 100644
--- 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 d1374f3d0d3..e7040e3c496 100644
--- 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)