(line-number-display-limit): Doc fix.

[bpt/emacs.git] / src / category.h

diff --git a/src/category.h b/src/category.h
index f475928..644e605 100644 (file)
--- a/src/category.h
+++ b/src/category.h
@@ -1,7 +1,6 @@
 /* Declarations having to do with Emacs category tables.
-   Ver.1.0
-   Copyright (C) 1995 Free Software Foundation, Inc.
    Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
+     Licensed to the Free Software Foundation.
 
 This file is part of GNU Emacs.
 
@@ -80,9 +79,8 @@ Boston, MA 02111-1307, USA.  */
 /* Return 1 if CATEGORY_SET contains CATEGORY, else return 0.
    The faster version of `!NILP (Faref (category_set, category))'.  */
 #define CATEGORY_MEMBER(category, category_set)                                \
-  (!NILP (category_set)                                                        \
-   && (XCATEGORY_SET (category_set)->data[XFASTINT (category) / 8]     \
-       & (1 << (XFASTINT (category) % 8))))
+  (XCATEGORY_SET (category_set)->data[(category) / 8]                  \
+   & (1 << ((category) % 8)))
 
 /* Temporary internal variable used in macro CHAR_HAS_CATEGORY.  */
 extern Lisp_Object _temp_category_set;
@@ -107,24 +105,26 @@ extern Lisp_Object _temp_category_set;
         table = XCHAR_TABLE (table)->parent;                                \
      else                                                                   \
        temp = Faref (table,                                                 \
-                    COMPOSITE_CHAR_P (c) ? cmpchar_component (c, 0) : (c)); \
+                    make_number (COMPOSITE_CHAR_P (c)                       \
+                                 ? cmpchar_component ((c), 0, 1) : (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,                                 \
-                  COMPOSITE_CHAR_P (c) ? cmpchar_component ((c), 0) : (c))
+           make_number (COMPOSITE_CHAR_P (c)                                \
+                        ? cmpchar_component ((c), 0, 1) : (c))))
 #endif   
 
 /* Return the doc string of CATEGORY in category table TABLE.  */
 #define CATEGORY_DOCSTRING(table, category) \
-  XVECTOR (Fchar_table_extra_slot (table, 0))->contents[(category) - ' ']
+  XVECTOR (Fchar_table_extra_slot (table, make_number (0)))->contents[(category) - ' ']
 
 /* Return the version number of category table TABLE.  Not used for
    the moment.  */
 #define CATEGORY_TABLE_VERSION (table) \
-  Fchar_table_extra_slot (table, 1)
+  Fchar_table_extra_slot (table, make_number (1))
 
 /* Return 1 if there is a word boundary between two word-constituent
    characters C1 and C2 if they appear in this order, else return 0.
@@ -133,3 +133,5 @@ 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));