From: Kim F. Storm <storm@cua.dk>
Date: Wed, 12 Jul 2006 13:14:11 +0000 (+0000)
Subject: (CHECK_CATEGORY, CHECK_CATEGORY_SET): Use CHECK_TYPE.
X-Git-Tag: emacs-pretest-22.0.90~1514
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e9d10c3dcca9f0b29b37c89d10d1d9521676b1a;p=emacs.git

(CHECK_CATEGORY, CHECK_CATEGORY_SET): Use CHECK_TYPE.
---

diff --git a/src/category.h b/src/category.h
index ade8704db09..413505ece61 100644
--- a/src/category.h
+++ b/src/category.h
@@ -54,10 +54,8 @@ Boston, MA 02110-1301, USA.  */
 #define CATEGORYP(x) \
   (INTEGERP ((x)) && XFASTINT ((x)) >= 0x20 && XFASTINT ((x)) <= 0x7E)
 
-#define CHECK_CATEGORY(x)						\
-  do {									\
-    if (!CATEGORYP ((x))) x = wrong_type_argument (Qcategoryp, (x));	\
-  } while (0)
+#define CHECK_CATEGORY(x) \
+  CHECK_TYPE (CATEGORYP (x), Qcategoryp, x)
 
 #define XCATEGORY_SET XBOOL_VECTOR
 
@@ -72,10 +70,8 @@ Boston, MA 02110-1301, USA.  */
 #define SET_CATEGORY_SET(category_set, category, val) \
   (Faset (category_set, category, val))
 
-#define CHECK_CATEGORY_SET(x)					   \
-  do {									   \
-    if (!CATEGORY_SET_P ((x))) x = wrong_type_argument (Qcategorysetp, (x)); \
-  } while (0)
+#define CHECK_CATEGORY_SET(x) \
+  CHECK_TYPE (CATEGORY_SET_P (x), Qcategorysetp, x)
 
 /* Return 1 if CATEGORY_SET contains CATEGORY, else return 0.
    The faster version of `!NILP (Faref (category_set, category))'.  */