comparison src/window.c @ 83474:d08a7ef0cb8a

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
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 20 Feb 2006 16:30:15 +0000
parents b98066f4aa10 5d68b6ede0d1
children 856efda75a1b
comparison
equal deleted inserted replaced
83473:428d132b4028 83474:d08a7ef0cb8a
2568 } 2568 }
2569 } 2569 }
2570 else 2570 else
2571 { 2571 {
2572 if (width_p) 2572 if (width_p)
2573 size = window_min_width; 2573 size = max (window_min_width,
2574 (MIN_SAFE_WINDOW_WIDTH
2575 + WINDOW_FRINGE_COLS (w)
2576 + WINDOW_SCROLL_BAR_COLS (w)));
2574 else 2577 else
2575 { 2578 {
2576 if (MINI_WINDOW_P (w) 2579 if (MINI_WINDOW_P (w)
2577 || (!WINDOW_WANTS_MODELINE_P (w) 2580 || (!WINDOW_WANTS_MODELINE_P (w)
2578 && !WINDOW_WANTS_HEADER_LINE_P (w))) 2581 && !WINDOW_WANTS_HEADER_LINE_P (w)))
4286 { 4289 {
4287 if (!NILP (XWINDOW (window)->next)) 4290 if (!NILP (XWINDOW (window)->next))
4288 { 4291 {
4289 /* This may happen for the minibuffer. In that case 4292 /* This may happen for the minibuffer. In that case
4290 the window_deletion_count check below does not work. */ 4293 the window_deletion_count check below does not work. */
4291 if (XINT (CURSIZE (p->next)) - delta <= 0) 4294 if (XINT (CURSIZE (p->next)) - delta <= 0)
4292 { 4295 {
4293 Fset_window_configuration (old_config); 4296 Fset_window_configuration (old_config);
4294 error ("Cannot adjust window size as specified"); 4297 error ("Cannot adjust window size as specified");
4295 } 4298 }
4296 4299
6600 Second parameter WIDTH specifies the pixel width for the scroll bar; 6603 Second parameter WIDTH specifies the pixel width for the scroll bar;
6601 this is automatically adjusted to a multiple of the frame column width. 6604 this is automatically adjusted to a multiple of the frame column width.
6602 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll 6605 Third parameter VERTICAL-TYPE specifies the type of the vertical scroll
6603 bar: left, right, or nil. 6606 bar: left, right, or nil.
6604 If WIDTH is nil, use the frame's scroll-bar width. 6607 If WIDTH is nil, use the frame's scroll-bar width.
6605 If TYPE is t, use the frame's scroll-bar type. */) 6608 If VERTICAL-TYPE is t, use the frame's scroll-bar type.
6609 Fourth parameter HORIZONTAL-TYPE is currently unused. */)
6606 (window, width, vertical_type, horizontal_type) 6610 (window, width, vertical_type, horizontal_type)
6607 Lisp_Object window, width, vertical_type, horizontal_type; 6611 Lisp_Object window, width, vertical_type, horizontal_type;
6608 { 6612 {
6609 struct window *w = decode_window (window); 6613 struct window *w = decode_window (window);
6610 6614