# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 780634585 0
# Node ID 0b4836daa8e1789631ca3aa69dfaba56d17661c8
# Parent  e475f810815638b650a77441f5f2cd70ba613278
(Fframep, make_frame_without_minibuffer, do_switch_frame, prev_frame,
Fdelete_frame, Fvisible_frame_list, store_frame_param): Use type test macros.

diff -r e475f8108156 -r 0b4836daa8e1 src/frame.c
--- a/src/frame.c	Tue Sep 27 02:55:09 1994 +0000
+++ b/src/frame.c	Tue Sep 27 02:56:25 1994 +0000
@@ -100,7 +100,7 @@
   (object)
      Lisp_Object object;
 {
-  if (XTYPE (object) != Lisp_Frame)
+  if (!FRAMEP (object))
     return Qnil;
   switch (XFRAME (object)->output_method)
     {
@@ -251,7 +251,7 @@
   /* Choose the minibuffer window to use.  */
   if (NILP (mini_window))
     {
-      if (XTYPE (Vdefault_minibuffer_frame) != Lisp_Frame)
+      if (!FRAMEP (Vdefault_minibuffer_frame))
 	error ("default-minibuffer-frame must be set when creating minibufferless frames");
       if (! FRAME_LIVE_P (XFRAME (Vdefault_minibuffer_frame)))
 	error ("default-minibuffer-frame must be a live frame");
@@ -373,13 +373,12 @@
 	{
 	  Lisp_Object focus;
 
-	  if (XTYPE (XCONS (tail)->car) != Lisp_Frame)
+	  if (!FRAMEP (XCONS (tail)->car))
 	    abort ();
 
 	  focus = FRAME_FOCUS_FRAME (XFRAME (XCONS (tail)->car));
 
-	  if (XTYPE (focus) == Lisp_Frame
-	      && XFRAME (focus) == selected_frame)
+	  if (FRAMEP (focus) && XFRAME (focus) == selected_frame)
 	    Fredirect_frame_focus (XCONS (tail)->car, frame);
 	}
     }
@@ -657,7 +656,7 @@
       Lisp_Object f;
 
       f = XCONS (tail)->car;
-      if (XTYPE (f) != Lisp_Frame)
+      if (!FRAMEP (f))
 	abort ();
 
       if (EQ (frame, f) && !NILP (prev))
@@ -944,7 +943,7 @@
 	  Lisp_Object this;
 
 	  this = XCONS (frames)->car;
-	  if (XTYPE (this) != Lisp_Frame)
+	  if (!FRAMEP (this))
 	    abort ();
 	  f = XFRAME (this);
 
@@ -1224,7 +1223,7 @@
   for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
     {
       frame = XCONS (tail)->car;
-      if (XTYPE (frame) != Lisp_Frame)
+      if (!FRAMEP (frame))
 	continue;
       f = XFRAME (frame);
       if (FRAME_VISIBLE_P (f))
@@ -1376,8 +1375,7 @@
   else
     Fsetcdr (tem, val);
 
-  if (EQ (prop, Qminibuffer)
-      && XTYPE (val) == Lisp_Window)
+  if (EQ (prop, Qminibuffer) && WINDOWP (val))
     {
       if (! MINI_WINDOW_P (XWINDOW (val)))
 	error ("Surrogate minibuffer windows must be minibuffer windows.");