Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-91
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-92
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-93
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-94
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-95
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-96
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-97
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-98
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-99
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-100
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-101
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-102
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-103
   Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo.

 * emacs@sv.gnu.org/emacs--devo--0--patch-104
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-30
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-31
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-32
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-33
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-34
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-35
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-36
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-514

1 files changed, 7 insertions, 3 deletions

diff --git a/src/window.c b/src/window.c
index 58ab3ee14a0..350b4753491 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2570,7 +2570,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)
@@ -4288,7 +4291,7 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
             {
               /* This may happen for the minibuffer.  In that case
                  the window_deletion_count check below does not work.  */
-              if (XINT (CURSIZE (p->next)) - delta <= 0) 
+              if (XINT (CURSIZE (p->next)) - delta <= 0)
                 {
                   Fset_window_configuration (old_config);
                   error ("Cannot adjust window size as specified");
@@ -6602,7 +6605,8 @@ this is automatically adjusted to a multiple of the frame column width.
 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
 bar: left, right, or nil.
 If WIDTH is nil, use the frame's scroll-bar width.
-If TYPE is t, use the frame's scroll-bar type.  */)
+If VERTICAL-TYPE is t, use the frame's scroll-bar type.
+Fourth parameter HORIZONTAL-TYPE is currently unused.  */)
      (window, width, vertical_type, horizontal_type)
      Lisp_Object window, width, vertical_type, horizontal_type;
 {