From: morioka <morioka>
Date: Thu, 17 Sep 1998 15:03:39 +0000 (+0000)
Subject: Move function `char-category' from emu-e20.el and emu-x20.el to
X-Git-Tag: poe-199811302358~24
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=6e5c71d7d499f3213a4816ba08cf16da8c9bfd74;p=elisp%2Fapel.git

Move function `char-category' from emu-e20.el and emu-x20.el to
emu.el.
---

diff --git a/emu-e20.el b/emu-e20.el
index eb70b42..e076c74 100644
--- a/emu-e20.el
+++ b/emu-e20.el
@@ -31,20 +31,6 @@
 (require 'poem)
 
 
-;;; @ character
-;;;
-
-;;; @@ Mule emulating aliases
-;;;
-;;; You should not use them.
-
-(defun char-category (character)
-  "Return string of category mnemonics for CHAR in TABLE.
-CHAR can be any multilingual character
-TABLE defaults to the current buffer's category table."
-  (category-set-mnemonics (char-category-set character)))
-
-
 ;;; @ CCL
 ;;;
 (eval-when-compile (require 'ccl))
diff --git a/emu-x20.el b/emu-x20.el
index 842d6c7..40f466a 100644
--- a/emu-x20.el
+++ b/emu-x20.el
@@ -42,25 +42,6 @@
          'encode (symbol-value encoder))))
 
 
-;;; @ character
-;;;
-
-;;; @@ Mule emulating aliases
-;;;
-;;; You should not use them.
-
-;;(defalias 'char-leading-char 'char-charset)
-
-(defun char-category (character)
-  "Return string of category mnemonics for CHAR in TABLE.
-CHAR can be any multilingual character
-TABLE defaults to the current buffer's category table."
-  (mapconcat (lambda (chr)
-	       (char-to-string (int-char chr)))
-	     (char-category-list character)
-	     ""))
-
-
 ;;; @ end
 ;;;
 
diff --git a/emu.el b/emu.el
index cd62652..7576479 100644
--- a/emu.el
+++ b/emu.el
@@ -81,12 +81,32 @@
        (cond ((featurep 'xemacs)
 	      ;; for XEmacs with MULE
 	      (require 'emu-x20)
+	      
+	      ;; old Mule emulating aliases
+
+	      ;;(defalias 'char-leading-char 'char-charset)
+
+	      (defun char-category (character)
+		"Return string of category mnemonics for CHAR in TABLE.
+CHAR can be any multilingual character
+TABLE defaults to the current buffer's category table."
+		(mapconcat (lambda (chr)
+			     (char-to-string (int-char chr)))
+			   (char-category-list character)
+			   ""))
 	      )
 	     ((>= emacs-major-version 20)
 	      ;; for Emacs 20
 	      (require 'emu-e20)
 	      (defalias 'insert-binary-file-contents-literally
 		'insert-file-contents-literally)
+	      
+	      ;; old Mule emulating aliases
+	      (defun char-category (character)
+		"Return string of category mnemonics for CHAR in TABLE.
+CHAR can be any multilingual character
+TABLE defaults to the current buffer's category table."
+		(category-set-mnemonics (char-category-set character)))
 	      )
 	     (t
 	      ;; for MULE 1.* and 2.*