Mercurial > emacs
diff src/window.c @ 90317:34c8b755296d
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-23
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 113-118)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 38-39)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 24 Feb 2006 08:08:56 +0000 |
parents | d1c5430c5bff 527507f1a62e |
children | 5754737d1e04 |
line wrap: on
line diff
--- a/src/window.c Fri Feb 24 06:32:18 2006 +0000 +++ b/src/window.c Fri Feb 24 08:08:56 2006 +0000 @@ -1861,7 +1861,8 @@ Lisp_Object frame, minibuf, window; { if (NILP (window)) - window = selected_window; + window = FRAMEP (frame) ? XFRAME (frame)->selected_window : selected_window; + CHECK_WINDOW (window); if (NILP (frame)) frame = selected_frame;