Commit 774910eb authored by Jim Blandy's avatar Jim Blandy
Browse files

* 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.
parent 11edeb03
...@@ -248,7 +248,7 @@ make_frame_without_minibuffer (mini_window) ...@@ -248,7 +248,7 @@ make_frame_without_minibuffer (mini_window)
} }
else else
{ {
CHECK_WINDOW (mini_window, 0); CHECK_LIVE_WINDOW (mini_window, 0);
} }
/* Make a frame containing just a root window. */ /* Make a frame containing just a root window. */
...@@ -375,7 +375,7 @@ DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0, ...@@ -375,7 +375,7 @@ DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0,
(window) (window)
Lisp_Object window; Lisp_Object window;
{ {
CHECK_WINDOW (window, 0); CHECK_LIVE_WINDOW (window, 0);
return XWINDOW (window)->frame; return XWINDOW (window)->frame;
} }
......
...@@ -436,7 +436,7 @@ as a menu label.") ...@@ -436,7 +436,7 @@ as a menu label.")
CHECK_NUMBER(X_Position, 0); CHECK_NUMBER(X_Position, 0);
CHECK_NUMBER(Y_Position, 1); CHECK_NUMBER(Y_Position, 1);
CHECK_WINDOW(window, 2); CHECK_LIVE_WINDOW(window, 2);
CHECK_NUMBER(Button, 3); CHECK_NUMBER(Button, 3);
CHECK_VECTOR(MEnu, 4); CHECK_VECTOR(MEnu, 4);
......
/* X Communication module for terminals which understand the X protocol. /* 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. This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify 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 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. any later version.
GNU Emacs is distributed in the hope that it will be useful, 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.") ...@@ -137,7 +137,7 @@ be the return value for that line (i.e. if it is selected.")
x = Fcar (tem); x = Fcar (tem);
y = Fcdr (tem); y = Fcdr (tem);
} }
CHECK_WINDOW (window, 0); CHECK_LIVE_WINDOW (window, 0);
CHECK_NUMBER (x, 0); CHECK_NUMBER (x, 0);
CHECK_NUMBER (y, 0); CHECK_NUMBER (y, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment