/* 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.
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,
#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)
#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)
&& 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) \
#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) */