* category.c (SET_CATEGORY_SET, set_category_set): Move here.

* category.h: ... from here.
* category.c (check_category_table, set_category_set): Now static.

3 files changed, 12 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 45a6e1011ff..dd0166bd0f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * category.c (SET_CATEGORY_SET, set_category_set): Move here.
+        * category.h: ... from here.
+        * category.c (check_category_table, set_category_set): Now static.
+
         * casetab.c (Vascii_upcase_table, Vascii_eqv_table): Now static.
         * lisp.h: Remove these decls.
 
diff --git a/src/category.c b/src/category.c
index 5dcc4894f0e..356801a179c 100644
--- a/src/category.c
+++ b/src/category.c
@@ -53,6 +53,11 @@ static Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p
 /* Temporary internal variable used in macro CHAR_HAS_CATEGORY.  */
 Lisp_Object _temp_category_set;
 
+/* Make CATEGORY_SET includes (if VAL is t) or excludes (if VAL is
+   nil) CATEGORY.  */
+#define SET_CATEGORY_SET(category_set, category, val) \
+  set_category_set (category_set, category, val)
+static void set_category_set (Lisp_Object, Lisp_Object, Lisp_Object);
 
 /* Category set staff.  */
 
@@ -111,7 +116,7 @@ those categories.  */)
 
 /* Category staff.  */
 
-Lisp_Object check_category_table (Lisp_Object table);
+static Lisp_Object check_category_table (Lisp_Object table);
 
 DEFUN ("define-category", Fdefine_category, Sdefine_category, 2, 3, 0,
        doc: /* Define CATEGORY as a category which is described by DOCSTRING.
@@ -185,7 +190,7 @@ DEFUN ("category-table-p", Fcategory_table_p, Scategory_table_p, 1, 1, 0,
    valid, return TABLE itself, but if not valid, signal an error of
    wrong-type-argument.  */
 
-Lisp_Object
+static Lisp_Object
 check_category_table (Lisp_Object table)
 {
   if (NILP (table))
@@ -325,7 +330,7 @@ The return value is a string containing those same categories.  */)
   return build_string (str);
 }
 
-void
+static void
 set_category_set (Lisp_Object category_set, Lisp_Object category, Lisp_Object val)
 {
   do {
diff --git a/src/category.h b/src/category.h
index b279f3d9c59..eacd89ce2cb 100644
--- a/src/category.h
+++ b/src/category.h
@@ -67,11 +67,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Return a new empty category set.  */
 #define MAKE_CATEGORY_SET (Fmake_bool_vector (make_number (128), Qnil))
 
-/* Make CATEGORY_SET includes (if VAL is t) or excludes (if VAL is
-   nil) CATEGORY.  */
-#define SET_CATEGORY_SET(category_set, category, val) \
-  (set_category_set (category_set, category, val))
-
 #define CHECK_CATEGORY_SET(x) \
   CHECK_TYPE (CATEGORY_SET_P (x), Qcategorysetp, x)
 
@@ -114,5 +109,3 @@ extern Lisp_Object _temp_category_set;
    && word_boundary_p (c1, c2))
 
 extern int word_boundary_p (int, int);
-extern void set_category_set (Lisp_Object, Lisp_Object, Lisp_Object);
-