* frame.c (make_frame_without_minibuffer, Fwindow_frame): Use

	CHECK_LIVE_WINDOW instead of CHECK_WINDOW.
	* sunfns.c (Fsun_menu_internal): Same.
	* xmenu.c (Fx_popup_menu): Same.

3 files changed, 6 insertions, 6 deletions

diff --git a/src/frame.c b/src/frame.c
index ce1c45779d0..7951fc3a320 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -248,7 +248,7 @@ make_frame_without_minibuffer (mini_window)
     }
   else
     {
-      CHECK_WINDOW (mini_window, 0);
+      CHECK_LIVE_WINDOW (mini_window, 0);
     }
 
   /* Make a frame containing just a root window.  */
@@ -375,7 +375,7 @@ DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0,
   (window)
      Lisp_Object window;
 {
-  CHECK_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window, 0);
   return XWINDOW (window)->frame;
 }
 
diff --git a/src/sunfns.c b/src/sunfns.c
index d870c7e4090..5fcf6f6cf0b 100644
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -436,7 +436,7 @@ as a menu label.")
   
   CHECK_NUMBER(X_Position, 0);
   CHECK_NUMBER(Y_Position, 1);
-  CHECK_WINDOW(window, 2);
+  CHECK_LIVE_WINDOW(window, 2);
   CHECK_NUMBER(Button, 3);
   CHECK_VECTOR(MEnu, 4);
 
diff --git a/src/xmenu.c b/src/xmenu.c
index 14f45cb18b9..025b61e4084 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,11 +1,11 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1986, 1988 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1988, 1992 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -137,7 +137,7 @@ be the return value for that line (i.e. if it is selected.")
       x = Fcar (tem);
       y = Fcdr (tem);
     }
-  CHECK_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window, 0);
   CHECK_NUMBER (x, 0);
   CHECK_NUMBER (y, 0);