Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/src/window.c Mon Dec 06 12:38:25 2004 +0000 +++ b/src/window.c Wed Dec 08 05:02:30 2004 +0000 @@ -1611,7 +1611,7 @@ : Qnil); else if (EQ (*all_frames, Qvisible)) ; - else if (XFASTINT (*all_frames) == 0) + else if (EQ (*all_frames, make_number (0))) ; else if (FRAMEP (*all_frames)) ; @@ -1885,7 +1885,7 @@ if (f) frame_arg = Qlambda; - else if (XFASTINT (frames) == 0) + else if (EQ (frames, make_number (0))) frame_arg = frames; else if (EQ (frames, Qvisible)) frame_arg = frames; @@ -2097,6 +2097,8 @@ doc: /* Return the window least recently selected or used for display. Return a full-width window if possible. A minibuffer window is never a candidate. +A dedicated window is never a candidate, so if all windows are dedicated, +the value is nil. If optional argument FRAME is `visible', search all visible frames. If FRAME is 0, search all visible and iconified frames. If FRAME is t, search all frames. @@ -2117,6 +2119,8 @@ DEFUN ("get-largest-window", Fget_largest_window, Sget_largest_window, 0, 1, 0, doc: /* Return the largest window in area. A minibuffer window is never a candidate. +A dedicated window is never a candidate, so if all windows are dedicated, +the value is nil. If optional argument FRAME is `visible', search all visible frames. If FRAME is 0, search all visible and iconified frames. If FRAME is t, search all frames. @@ -2694,7 +2698,7 @@ ++nonzero_sizes; nonzero_idx = i; } - + for (i = 0; i < nchildren; ++i) if (new_sizes[i] > min_size) { @@ -3012,6 +3016,9 @@ if (EQ (window, selected_window)) b->last_selected_window = window; + /* Let redisplay errors through. */ + b->display_error_modiff = 0; + /* Update time stamps of buffer display. */ if (INTEGERP (b->display_count)) XSETINT (b->display_count, XINT (b->display_count) + 1); @@ -6178,10 +6185,12 @@ struct window *w = decode_window (window); if (!NILP (width)) - CHECK_NATNUM (width); - - if (XINT (width) == 0) - vertical_type = Qnil; + { + CHECK_NATNUM (width); + + if (XINT (width) == 0) + vertical_type = Qnil; + } if (!(EQ (vertical_type, Qnil) || EQ (vertical_type, Qleft)
