From: Karl Heuer <kwzh@gnu.org>
Date: Tue, 27 Sep 1994 03:16:02 +0000 (+0000)
Subject: (Fmake_list, Fmake_vector, Fmake_string, make_event_array): Use type test
X-Git-Tag: emacs-19.34~6710
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e687453f6e222aa19080885204c462394579ed58;p=emacs.git

(Fmake_list, Fmake_vector, Fmake_string, make_event_array): Use type test
macros.
---

diff --git a/src/alloc.c b/src/alloc.c
index 32152fa85b0..76d0f64efa5 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -570,7 +570,7 @@ DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0,
   register Lisp_Object val;
   register int size;
 
-  if (XTYPE (length) != Lisp_Int || XINT (length) < 0)
+  if (!INTEGERP (length) || XINT (length) < 0)
     length = wrong_type_argument (Qnatnump, length);
   size = XINT (length);
 
@@ -594,7 +594,7 @@ See also the function `vector'.")
   register Lisp_Object vector;
   register struct Lisp_Vector *p;
 
-  if (XTYPE (length) != Lisp_Int || XINT (length) < 0)
+  if (!INTEGERP (length) || XINT (length) < 0)
     length = wrong_type_argument (Qnatnump, length);
   sizei = XINT (length);
 
@@ -875,7 +875,7 @@ Both LENGTH and INIT must be numbers.")
   register Lisp_Object val;
   register unsigned char *p, *end, c;
 
-  if (XTYPE (length) != Lisp_Int || XINT (length) < 0)
+  if (!INTEGERP (length) || XINT (length) < 0)
     length = wrong_type_argument (Qnatnump, length);
   CHECK_NUMBER (init, 1);
   val = make_uninit_string (XINT (length));
@@ -975,7 +975,7 @@ make_event_array (nargs, args)
     /* The things that fit in a string
        are characters that are in 0...127,
        after discarding the meta bit and all the bits above it.  */
-    if (XTYPE (args[i]) != Lisp_Int
+    if (!INTEGERP (args[i])
 	|| (XUINT (args[i]) & ~(-CHAR_META)) >= 0200)
       return Fvector (nargs, args);