comparison src/window.c @ 90314:d1c5430c5bff

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-21 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 97-112) - Update from CVS - Merge from erc--emacs--0 - Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 37) - Update from CVS
author Miles Bader <miles@gnu.org>
date Wed, 22 Feb 2006 06:54:10 +0000
parents 4b3d39451150 5d68b6ede0d1
children 34c8b755296d
comparison
equal deleted inserted replaced
90313:496f6d9b9d20 90314:d1c5430c5bff
2566 } 2566 }
2567 } 2567 }
2568 else 2568 else
2569 { 2569 {
2570 if (width_p) 2570 if (width_p)
2571 size = window_min_width; 2571 size = max (window_min_width,
2572 (MIN_SAFE_WINDOW_WIDTH
2573 + WINDOW_FRINGE_COLS (w)
2574 + WINDOW_SCROLL_BAR_COLS (w)));
2572 else 2575 else
2573 { 2576 {
2574 if (MINI_WINDOW_P (w) 2577 if (MINI_WINDOW_P (w)
2575 || (!WINDOW_WANTS_MODELINE_P (w) 2578 || (!WINDOW_WANTS_MODELINE_P (w)
2576 && !WINDOW_WANTS_HEADER_LINE_P (w))) 2579 && !WINDOW_WANTS_HEADER_LINE_P (w)))
4284 { 4287 {
4285 if (!NILP (XWINDOW (window)->next)) 4288 if (!NILP (XWINDOW (window)->next))
4286 { 4289 {
4287 /* This may happen for the minibuffer. In that case 4290 /* This may happen for the minibuffer. In that case
4288 the window_deletion_count check below does not work. */ 4291 the window_deletion_count check below does not work. */
4289 if (XINT (CURSIZE (p->next)) - delta <= 0) 4292 if (XINT (CURSIZE (p->next)) - delta <= 0)
4290 { 4293 {
4291 Fset_window_configuration (old_config); 4294 Fset_window_configuration (old_config);
4292 error ("Cannot adjust window size as specified"); 4295 error ("Cannot adjust window size as specified");
4293 } 4296 }
4294 4297
6598 Second parameter WIDTH specifies the pixel width for the scroll bar; 6601 Second parameter WIDTH specifies the pixel width for the scroll bar;
6599 this is automatically adjusted to a multiple of the frame column width. 6602 this is automatically adjusted to a multiple of the frame column width.
6600 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll 6603 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
6601 bar: left, right, or nil. 6604 bar: left, right, or nil.
6602 If WIDTH is nil, use the frame's scroll-bar width. 6605 If WIDTH is nil, use the frame's scroll-bar width.
6603 If TYPE is t, use the frame's scroll-bar type. */) 6606 If VERTICAL-TYPE is t, use the frame's scroll-bar type.
6607 Fourth parameter HORIZONTAL-TYPE is currently unused. */)
6604 (window, width, vertical_type, horizontal_type) 6608 (window, width, vertical_type, horizontal_type)
6605 Lisp_Object window, width, vertical_type, horizontal_type; 6609 Lisp_Object window, width, vertical_type, horizontal_type;
6606 { 6610 {
6607 struct window *w = decode_window (window); 6611 struct window *w = decode_window (window);
6608 6612