Mercurial > emacs

comparison src/window.c @ 69104:527507f1a62e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Fwindow_list): Check `window' before doing XWINDOW. The default `window' should not be "on a different frame".
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 22 Feb 2006 21:01:34 +0000
parents 5d68b6ede0d1
children b9ad41f39bf6 856efda75a1b 34c8b755296d
comparison
equal deleted inserted replaced
69103:98dc9c749829 69104:527507f1a62e
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");