comparison src/window.c @ 91073:4bc33ffdda1a

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 902-908) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 131-137) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 261-262) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author Miles Bader <miles@gnu.org>
date Sat, 27 Oct 2007 09:12:07 +0000
parents 1251cabc40b7 4fe615944676
children 53108e6cea98
comparison
equal deleted inserted replaced
91072:74ab3ea909f9 91073:4bc33ffdda1a
2688 2688
2689 return fixed_p; 2689 return fixed_p;
2690 } 2690 }
2691 2691
2692 /* Return the minimum size for leaf window W. WIDTH_P non-zero means 2692 /* Return the minimum size for leaf window W. WIDTH_P non-zero means
2693 take into account fringes and the scrollbar of W. WIDTH_P zero 2693 take into account fringes and the scrollbar of W. WIDTH_P zero means
2694 means take into account mode-line and header-line of W. Return 1 2694 take into account mode-line of W. Return 1 for the minibuffer. */
2695 for the minibuffer. */
2696 2695
2697 static int 2696 static int
2698 window_min_size_2 (w, width_p) 2697 window_min_size_2 (w, width_p)
2699 struct window *w; 2698 struct window *w;
2700 int width_p; 2699 int width_p;
2709 else if (MINI_WINDOW_P (w)) 2708 else if (MINI_WINDOW_P (w))
2710 size = 1; 2709 size = 1;
2711 else 2710 else
2712 size = max (window_min_height, 2711 size = max (window_min_height,
2713 (MIN_SAFE_WINDOW_HEIGHT 2712 (MIN_SAFE_WINDOW_HEIGHT
2714 + (WINDOW_WANTS_MODELINE_P (w) ? 1 : 0) 2713 /* Don't count the header-line here. It would break
2715 + (WINDOW_WANTS_HEADER_LINE_P (w) ? 1 : 0 ))); 2714 splitting a window with a header-line when the new
2715 window shall have a height of two (calculator does
2716 that). */
2717 + (WINDOW_WANTS_MODELINE_P (w) ? 1 : 0)));
2716 2718
2717 return size; 2719 return size;
2718 } 2720 }
2719 2721
2720 /* Return the minimum size of window W, not taking fixed-width windows 2722 /* Return the minimum size of window W, not taking fixed-width windows