Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / src / category.h

diff --git a/src/category.h b/src/category.h
index f646f9ddfcba1a3f5d0c6aae6448359d515b8892..ac79c13a83b9c1a21be303cbf57dbdfcb311110f 100644 (file)
--- a/src/category.h
+++ b/src/category.h
@@ -16,8 +16,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 +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,27 +104,21 @@ 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) \
-  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 +127,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) */