Mercurial > emacs

comparison src/window.c @ 83478:856efda75a1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
83477:3a9507e5aa39 83478:856efda75a1b
1861 MINIBUF neither nil nor t means never include the minibuffer window. */) 1861 MINIBUF neither nil nor t means never include the minibuffer window. */)
1862 (frame, minibuf, window) 1862 (frame, minibuf, window)
1863 Lisp_Object frame, minibuf, window; 1863 Lisp_Object frame, minibuf, window;
1864 { 1864 {
1865 if (NILP (window)) 1865 if (NILP (window))
1866 window = selected_window; 1866 window = FRAMEP (frame) ? XFRAME (frame)->selected_window : selected_window;
1867 CHECK_WINDOW (window);
1867 if (NILP (frame)) 1868 if (NILP (frame))
1868 frame = selected_frame; 1869 frame = selected_frame;
1869 1870
1870 if (!EQ (frame, XWINDOW (window)->frame)) 1871 if (!EQ (frame, XWINDOW (window)->frame))
1871 error ("Window is on a different frame"); 1872 error ("Window is on a different frame");