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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/window.c b/src/window.c
index bd5a393b599..e4c8d0612cb 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1861,7 +1861,8 @@ MINIBUF neither nil nor t means never include the minibuffer window.  */)
      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;