X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ea625b14aebfb68d14e9b25916e88cf6a4e03b1a..204b78de1b66429250e18785a65392b5027ef103:/src/category.h?ds=sidebyside

diff --git a/src/category.h b/src/category.h
index f1c40f9cff..ade8704db0 100644
--- a/src/category.h
+++ b/src/category.h
@@ -1,6 +1,7 @@
 /* Declarations having to do with Emacs category tables.
-   Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-     Licensed to the Free Software Foundation.
+   Copyright (C) 1995, 1998, 1999
+     National Institute of Advanced Industrial Science and Technology (AIST)
+     Registration Number H14PRO021
 
 This file is part of GNU Emacs.
 
@@ -16,8 +17,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* We introduce here three types of object: category, category set,
@@ -53,7 +54,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 +72,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 +105,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) : (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) : (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) \
@@ -133,3 +128,8 @@ extern Lisp_Object _temp_category_set;
 #define WORD_BOUNDARY_P(c1, c2)					\
   (!(SINGLE_BYTE_CHAR_P (c1) && SINGLE_BYTE_CHAR_P (c2))	\
    && 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) */