Mercurial > emacs
comparison src/window.c @ 90054:f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
Update from CVS: src/indent.c (Fvertical_motion): Fix last change.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 08 Dec 2004 05:02:30 +0000 |
| parents | b637c617432f cd5b85acf394 |
| children | 95879cc1ed20 |
comparison
equal
deleted
inserted
replaced
| 90053:fff5f1a61d92 | 90054:f2ebccfa87d4 |
|---|---|
| 1609 *all_frames = (!EQ (*minibuf, Qlambda) | 1609 *all_frames = (!EQ (*minibuf, Qlambda) |
| 1610 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame)) | 1610 ? FRAME_MINIBUF_WINDOW (XFRAME (XWINDOW (*window)->frame)) |
| 1611 : Qnil); | 1611 : Qnil); |
| 1612 else if (EQ (*all_frames, Qvisible)) | 1612 else if (EQ (*all_frames, Qvisible)) |
| 1613 ; | 1613 ; |
| 1614 else if (XFASTINT (*all_frames) == 0) | 1614 else if (EQ (*all_frames, make_number (0))) |
| 1615 ; | 1615 ; |
| 1616 else if (FRAMEP (*all_frames)) | 1616 else if (FRAMEP (*all_frames)) |
| 1617 ; | 1617 ; |
| 1618 else if (!EQ (*all_frames, Qt)) | 1618 else if (!EQ (*all_frames, Qt)) |
| 1619 *all_frames = Qnil; | 1619 *all_frames = Qnil; |
| 1883 else | 1883 else |
| 1884 f = NULL; | 1884 f = NULL; |
| 1885 | 1885 |
| 1886 if (f) | 1886 if (f) |
| 1887 frame_arg = Qlambda; | 1887 frame_arg = Qlambda; |
| 1888 else if (XFASTINT (frames) == 0) | 1888 else if (EQ (frames, make_number (0))) |
| 1889 frame_arg = frames; | 1889 frame_arg = frames; |
| 1890 else if (EQ (frames, Qvisible)) | 1890 else if (EQ (frames, Qvisible)) |
| 1891 frame_arg = frames; | 1891 frame_arg = frames; |
| 1892 else | 1892 else |
| 1893 frame_arg = Qt; | 1893 frame_arg = Qt; |
| 2095 | 2095 |
| 2096 DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_window, 0, 1, 0, | 2096 DEFUN ("get-lru-window", Fget_lru_window, Sget_lru_window, 0, 1, 0, |
| 2097 doc: /* Return the window least recently selected or used for display. | 2097 doc: /* Return the window least recently selected or used for display. |
| 2098 Return a full-width window if possible. | 2098 Return a full-width window if possible. |
| 2099 A minibuffer window is never a candidate. | 2099 A minibuffer window is never a candidate. |
| 2100 A dedicated window is never a candidate, so if all windows are dedicated, | |
| 2101 the value is nil. | |
| 2100 If optional argument FRAME is `visible', search all visible frames. | 2102 If optional argument FRAME is `visible', search all visible frames. |
| 2101 If FRAME is 0, search all visible and iconified frames. | 2103 If FRAME is 0, search all visible and iconified frames. |
| 2102 If FRAME is t, search all frames. | 2104 If FRAME is t, search all frames. |
| 2103 If FRAME is nil, search only the selected frame. | 2105 If FRAME is nil, search only the selected frame. |
| 2104 If FRAME is a frame, search only that frame. */) | 2106 If FRAME is a frame, search only that frame. */) |
| 2115 } | 2117 } |
| 2116 | 2118 |
| 2117 DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 1, 0, | 2119 DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 1, 0, |
| 2118 doc: /* Return the largest window in area. | 2120 doc: /* Return the largest window in area. |
| 2119 A minibuffer window is never a candidate. | 2121 A minibuffer window is never a candidate. |
| 2122 A dedicated window is never a candidate, so if all windows are dedicated, | |
| 2123 the value is nil. | |
| 2120 If optional argument FRAME is `visible', search all visible frames. | 2124 If optional argument FRAME is `visible', search all visible frames. |
| 2121 If FRAME is 0, search all visible and iconified frames. | 2125 If FRAME is 0, search all visible and iconified frames. |
| 2122 If FRAME is t, search all frames. | 2126 If FRAME is t, search all frames. |
| 2123 If FRAME is nil, search only the selected frame. | 2127 If FRAME is nil, search only the selected frame. |
| 2124 If FRAME is a frame, search only that frame. */) | 2128 If FRAME is a frame, search only that frame. */) |
| 2692 if (new_sizes[i] > 0) | 2696 if (new_sizes[i] > 0) |
| 2693 { | 2697 { |
| 2694 ++nonzero_sizes; | 2698 ++nonzero_sizes; |
| 2695 nonzero_idx = i; | 2699 nonzero_idx = i; |
| 2696 } | 2700 } |
| 2697 | 2701 |
| 2698 for (i = 0; i < nchildren; ++i) | 2702 for (i = 0; i < nchildren; ++i) |
| 2699 if (new_sizes[i] > min_size) | 2703 if (new_sizes[i] > min_size) |
| 2700 { | 2704 { |
| 2701 --new_sizes[i]; | 2705 --new_sizes[i]; |
| 2702 ++total_removed; | 2706 ++total_removed; |
| 3009 | 3013 |
| 3010 w->buffer = buffer; | 3014 w->buffer = buffer; |
| 3011 | 3015 |
| 3012 if (EQ (window, selected_window)) | 3016 if (EQ (window, selected_window)) |
| 3013 b->last_selected_window = window; | 3017 b->last_selected_window = window; |
| 3018 | |
| 3019 /* Let redisplay errors through. */ | |
| 3020 b->display_error_modiff = 0; | |
| 3014 | 3021 |
| 3015 /* Update time stamps of buffer display. */ | 3022 /* Update time stamps of buffer display. */ |
| 3016 if (INTEGERP (b->display_count)) | 3023 if (INTEGERP (b->display_count)) |
| 3017 XSETINT (b->display_count, XINT (b->display_count) + 1); | 3024 XSETINT (b->display_count, XINT (b->display_count) + 1); |
| 3018 b->display_time = Fcurrent_time (); | 3025 b->display_time = Fcurrent_time (); |
| 6176 Lisp_Object window, width, vertical_type, horizontal_type; | 6183 Lisp_Object window, width, vertical_type, horizontal_type; |
| 6177 { | 6184 { |
| 6178 struct window *w = decode_window (window); | 6185 struct window *w = decode_window (window); |
| 6179 | 6186 |
| 6180 if (!NILP (width)) | 6187 if (!NILP (width)) |
| 6181 CHECK_NATNUM (width); | 6188 { |
| 6182 | 6189 CHECK_NATNUM (width); |
| 6183 if (XINT (width) == 0) | 6190 |
| 6184 vertical_type = Qnil; | 6191 if (XINT (width) == 0) |
| 6192 vertical_type = Qnil; | |
| 6193 } | |
| 6185 | 6194 |
| 6186 if (!(EQ (vertical_type, Qnil) | 6195 if (!(EQ (vertical_type, Qnil) |
| 6187 || EQ (vertical_type, Qleft) | 6196 || EQ (vertical_type, Qleft) |
| 6188 || EQ (vertical_type, Qright) | 6197 || EQ (vertical_type, Qright) |
| 6189 || EQ (vertical_type, Qt))) | 6198 || EQ (vertical_type, Qt))) |
