--- a/lisp/mule/mule-category.el	Mon Aug 13 09:18:41 2007 +0200
+++ b/lisp/mule/mule-category.el	Mon Aug 13 09:19:45 2007 +0200
@@ -119,16 +119,17 @@
 	  (setq a (1+ a)))
 	(nreverse list)))))
 
-(defun char-in-category-p (char category &optional table)
-  "Return non-nil if CHAR is in CATEGORY.
-TABLE defaults to the current buffer's category table.
-Categories are specified by their designators."
-  (or table (setq table (category-table)))
-  (check-argument-type 'category-table-p table)
-  (check-argument-type 'category-designator-p category)
-  (let ((vec (get-char-table char table)))
-    (if (null vec) nil
-      (= 1 (aref vec (- category 32))))))
+;; implimented in c, file chartab.c (97/3/14 jhod@po.iijnet.or.jp)
+;(defun char-in-category-p (char category &optional table)
+;  "Return non-nil if CHAR is in CATEGORY.
+;TABLE defaults to the current buffer's category table.
+;Categories are specified by their designators."
+;  (or table (setq table (category-table)))
+;  (check-argument-type 'category-table-p table)
+;  (check-argument-type 'category-designator-p category)
+;  (let ((vec (get-char-table char table)))
+;    (if (null vec) nil
+;      (= 1 (aref vec (- category 32))))))
 
 (defun describe-category ()
   "Describe the category specifications in the category table.
@@ -173,7 +174,7 @@
 		 (and (characterp range)
 		      (characterp first-char)
 		      (eq (char-charset range) (char-charset first-char))
-		      (= (char-int last-char) (1- (char-int range))))
+		      (= (char-to-int last-char) (1- (char-to-int range))))
 		 (and (vectorp range)
 		      (vectorp first-char)
 		      (eq (aref range 0) (aref first-char 0))
@@ -203,7 +204,7 @@
 		(if (not already-matched)
 		    (setq already-matched t)
 		  (princ " "))
-		(princ (int-char (+ 32 i)))))
+		(princ (int-to-char (+ 32 i)))))
 	  (setq i (1+ i)))
 	(if (not already-matched)
 	    (princ "(none)")))
@@ -211,7 +212,7 @@
 	(while (< i 95)
 	  (if (= 1 (aref code i))
 	      (princ (format "\n\t\tmeaning: %s"
-			    (category-doc-string (int-char (+ 32 i))))))
+			    (category-doc-string (int-to-char (+ 32 i))))))
 	  (setq i (1+ i)))))
     (terpri)))
 
@@ -258,3 +259,28 @@
 ;;; break line at any point under a restriction of 'kinsoku'.
 (defvar word-across-newline "\\(\\cj\\|\\cc\\|\\ct\\)"
   "Regular expression of such characters which can be a word across newline.")
+
+(defvar ascii-char "[\40-\176]")
+(defvar ascii-space "[ \t]")
+(defvar ascii-symbols "[\40-\57\72-\100\133-\140\173-\176]")
+(defvar ascii-numeric "[\60-\71]")
+(defvar ascii-English-Upper "[\101-\132]")
+(defvar ascii-English-Lower "[\141-\172]")
+(defvar ascii-alphanumeric "[\60-\71\101-\132\141-\172]")
+
+(defvar kanji-char "\\cj")
+(defvar kanji-space "$B!!(B")
+(defvar kanji-symbols "\\cS")
+(defvar kanji-numeric "[$B#0(B-$B#9(B]")
+(defvar kanji-English-Upper "[$B#A(B-$B#Z(B]")
+(defvar kanji-English-Lower  "[$B#a(B-$B#z(B]")
+(defvar kanji-hiragana "\\cH")
+(defvar kanji-katakana "\\cK")
+(defvar kanji-Greek-Upper "[$B&!(B-$B&8(B]")
+(defvar kanji-Greek-Lower "[$B&A(B-$B&X(B]")
+(defvar kanji-Russian-Upper "[$B'!(B-$B'A(B]")
+(defvar kanji-Russian-Lower "[$B'Q(B-$B'q(B]")
+(defvar kanji-Kanji-1st-Level  "[$B0!(B-$BOS(B]")
+(defvar kanji-Kanji-2nd-Level  "[$BP!(B-$Bt$(B]")
+
+(defvar kanji-kanji-char "\\(\\cH\\|\\cK\\|\\cC\\)")