Mercurial > emacs

comparison src/window.c @ 90317:34c8b755296d

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