Mercurial > emacs
diff src/window.c @ 83478:856efda75a1b
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-111
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-112
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-113
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-114
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-115
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-518
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 23 Feb 2006 03:17:52 +0000 |
parents | d08a7ef0cb8a 527507f1a62e |
children | a380ca43a190 |
line wrap: on
line diff
--- a/src/window.c Thu Feb 23 02:59:27 2006 +0000 +++ b/src/window.c Thu Feb 23 03:17:52 2006 +0000 @@ -1863,7 +1863,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;