X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c61bca6a2858108256801abf8f87caaa3cee1116..27540e81513199d5d4ec300b4cffd0ae1db74af1:/src/category.h

diff --git a/src/category.h b/src/category.h
index 644e605652..5607efaed6 100644
--- a/src/category.h
+++ b/src/category.h
@@ -53,7 +53,7 @@ Boston, MA 02111-1307, USA.  */
 #define CATEGORYP(x) \
   (INTEGERP ((x)) && XFASTINT ((x)) >= 0x20 && XFASTINT ((x)) <= 0x7E)
 
-#define CHECK_CATEGORY(x, i)						\
+#define CHECK_CATEGORY(x)						\
   do {									\
     if (!CATEGORYP ((x))) x = wrong_type_argument (Qcategoryp, (x));	\
   } while (0)
@@ -71,7 +71,7 @@ Boston, MA 02111-1307, USA.  */
 #define SET_CATEGORY_SET(category_set, category, val) \
   (Faset (category_set, category, val))
 
-#define CHECK_CATEGORY_SET(x, i)					   \
+#define CHECK_CATEGORY_SET(x)					   \
   do {									   \
     if (!CATEGORY_SET_P ((x))) x = wrong_type_argument (Qcategorysetp, (x)); \
   } while (0)
@@ -104,18 +104,12 @@ extern Lisp_Object _temp_category_set;
 	      && NILP (temp = XCHAR_TABLE (table)->defalt))		     \
 	 table = XCHAR_TABLE (table)->parent;				     \
      else								     \
-       temp = Faref (table,						     \
-		     make_number (COMPOSITE_CHAR_P (c)			     \
-				  ? cmpchar_component ((c), 0, 1) : (c)));   \
+       temp = Faref (table, make_number (c));				     \
      temp; })
 #else
-#define CATEGORY_SET(c)							     \
-  ((c) < CHAR_TABLE_SINGLE_BYTE_SLOTS					     \
-   ? Faref (current_buffer->category_table, make_number ((unsigned char) c)) \
-   : Faref (current_buffer->category_table,				     \
-	    make_number (COMPOSITE_CHAR_P (c)				     \
-			 ? cmpchar_component ((c), 0, 1) : (c))))
-#endif   
+#define CATEGORY_SET(c) \
+  Faref (current_buffer->category_table, make_number (c))
+#endif
 
 /* Return the doc string of CATEGORY in category table TABLE.  */
 #define CATEGORY_DOCSTRING(table, category) \
@@ -135,3 +129,6 @@ extern Lisp_Object _temp_category_set;
    && word_boundary_p (c1, c2))
 
 extern int word_boundary_p P_ ((int, int));
+
+/* arch-tag: 309dfe83-c3e2-4d22-8e81-faae5aece0ff
+   (do not change this comment) */