--- a/lisp/tl/emu-x20.el	Mon Aug 13 09:08:31 2007 +0200
+++ b/lisp/tl/emu-x20.el	Mon Aug 13 09:09:02 2007 +0200
@@ -1,13 +1,12 @@
 ;;; emu-x20.el --- emu API implementation for XEmacs 20 with mule
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
-;; Copyright (C) 1994,1995,1996 MORIOKA Tomohiko
+;; Copyright (C) 1994,1995,1996,1997 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: emu-x20.el,v 1.2 1997/01/23 05:29:40 steve Exp $
+;; Version: $Id: emu-x20.el,v 1.3 1997/01/30 02:22:46 steve Exp $
 ;; Keywords: emulation, compatibility, Mule, XEmacs
 
-;; This file is part of tl (Tiny Library).
+;; This file is part of XEmacs.
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -36,28 +35,6 @@
        )))
 
 
-;;; @ graphic character set
-;;;
-
-(defalias 'charset-description 'charset-doc-string)
-
-(defalias 'find-charset-string 'charsets-in-string)
-(defalias 'find-charset-region 'charsets-in-region)
-
-(defun find-non-ascii-charset-string (string)
-  "Return a list of charsets in the STRING except ascii.
-\[emu-x20.el; Mule emulating function]"
-  (delq 'ascii (charsets-in-string string))
-  )
-
-(defun find-non-ascii-charset-region (start end)
-  "Return a list of charsets except ascii
-in the region between START and END.
-\[emu-x20.el; Mule emulating function]"
-  (delq 'ascii (charsets-in-region start end))
-  )
-
-
 ;;; @ coding-system
 ;;;
 
@@ -96,30 +73,42 @@
     ((ascii greek-iso8859-7)				. iso-8859-7)
     ((ascii hebrew-iso8859-8)				. iso-8859-8)
     ((ascii latin-iso8859-9)				. iso-8859-9)
-    ((ascii japanese-jisx0208-1978 japanese-jisx0208)	. iso-2022-jp)
+    ((ascii latin-jisx0201
+	    japanese-jisx0208-1978 japanese-jisx0208)	. iso-2022-jp)
     ((ascii korean-ksc5601)				. euc-kr)
-    ((ascii chinese-big5-1 chinese-big5-2)		. big5)
-    ((ascii japanese-jisx0208-1978 chinese-gb
-	    japanese-jisx0208 korean-ksc5601
-	    japanese-jisx0212 latin-iso8859-1
-	    greek-iso8859-7)				. iso-2022-jp-2)
-    ((ascii japanese-jisx0208-1978 chinese-gb2312
-	    japanese-jisx0208 korean-ksc5601
-	    japanese-jisx0212
+    ((ascii chinese-gb2312)				. cn-gb-2312)
+    ((ascii chinese-big5-1 chinese-big5-2)		. cn-big5)
+    ((ascii latin-iso8859-1 greek-iso8859-7
+	    latin-jisx0201 japanese-jisx0208-1978
+	    chinese-gb2312 japanese-jisx0208
+	    korean-ksc5601 japanese-jisx0212)		. iso-2022-jp-2)
+    ((ascii latin-iso8859-1 greek-iso8859-7
+	    latin-jisx0201 japanese-jisx0208-1978
+	    chinese-gb2312 japanese-jisx0208
+	    korean-ksc5601 japanese-jisx0212
+	    chinese-cns11643-1 chinese-cns11643-2)	. iso-2022-int-1)
+    ((ascii latin-iso8859-1 latin-iso8859-2
+	    cyrillic-iso8859-5 greek-iso8859-7
+	    latin-jisx0201 japanese-jisx0208-1978
+	    chinese-gb2312 japanese-jisx0208
+	    korean-ksc5601 japanese-jisx0212
 	    chinese-cns11643-1 chinese-cns11643-2
-	    latin-iso8859-1 greek-iso8859-7)		. iso-2022-int-1)
+	    chinese-cns11643-3 chinese-cns11643-4
+	    chinese-cns11643-5 chinese-cns11643-6
+	    chinese-cns11643-7)				. iso-2022-int-1)
     ))
 
-(defvar default-mime-charset 'iso-2022-int-1)
+(defvar default-mime-charset 'x-ctext)
 
 (defvar mime-charset-coding-system-alist
-  '((iso-8859-1      . ctext)
-    (gb2312          . euc-china)
-    (koi8-r          . koi8)
-    (iso-2022-jp-2   . iso-2022-ss2-7)
-    (x-iso-2022-jp-2 . iso-2022-ss2-7)
-    (shift_jis       . sjis)
-    (x-shiftjis      . sjis)
+  '((iso-8859-1		. ctext)
+    (x-ctext		. ctext)
+    (hz-gb-2312		. hz)
+    (cn-gb-2312		. euc-china)
+    (gb2312		. euc-china)
+    (cn-big5		. big5)
+    (koi8-r		. koi8)
+    (iso-2022-jp-2	. iso-2022-ss2-7)
     ))
 
 (defun mime-charset-to-coding-system (charset)
@@ -170,24 +159,24 @@
 ;;; @ character
 ;;;
 
-;(defun char-bytes (chr) 1)
+;; (defun char-bytes (chr) 1)
 
-;(defun char-length (character)
-;  "Return number of elements a CHARACTER occupies in a string or buffer.
-;\[emu-x20.el]"
-;  1)
+;; (defun char-length (character)
+;;   "Return number of elements a CHARACTER occupies in a string or buffer.
+;; \[emu-x20.el]"
+;;   1)
 
-;(defun char-columns (character)
-;  "Return number of columns a CHARACTER occupies when displayed.
-;\[emu-x20.el]"
-;  (charset-columns (char-charset character))
-;  )
+;; (defun char-columns (character)
+;;   "Return number of columns a CHARACTER occupies when displayed.
+;; \[emu-x20.el]"
+;;   (charset-columns (char-charset character))
+;;   )
 
 ;;; @@ Mule emulating aliases
 ;;;
 ;;; You should not use them.
 
-;(defalias 'char-width 'char-columns)
+;;(defalias 'char-width 'char-columns)
 
 (defalias 'char-leading-char 'char-charset)
 
@@ -206,34 +195,34 @@
 ;;; @ string
 ;;;
 
-;(defun string-columns (string)
-;  "Return number of columns STRING occupies when displayed.
-;\[emu-x20.el]"
-;  (let ((col 0)
-;	(len (length string))
-;	(i 0))
-;    (while (< i len)
-;      (setq col (+ col (char-columns (aref string i))))
-;      (setq i (1+ i))
-;      )
-;    col))
+;; (defun string-columns (string)
+;;   "Return number of columns STRING occupies when displayed.
+;; \[emu-x20.el]"
+;;   (let ((col 0)
+;;         (len (length string))
+;;         (i 0))
+;;     (while (< i len)
+;;       (setq col (+ col (char-columns (aref string i))))
+;;       (setq i (1+ i))
+;;       )
+;;     col))
 
-;(defalias 'string-width 'string-columns)
+;;(defalias 'string-width 'string-columns)
 
 (defun string-to-int-list (str)
   (mapcar #'char-int str)
   )
 
-;(defalias 'sref 'aref)
+;;(defalias 'sref 'aref)
 
-;(defun truncate-string (str width &optional start-column)
-;  "Truncate STR to fit in WIDTH columns.
-;Optional non-nil arg START-COLUMN specifies the starting column.
-;\[emu-x20.el; Mule 2.3 emulating function]"
-;  (or start-column
-;      (setq start-column 0))
-;  (substring str start-column width)
-;  )
+;; (defun truncate-string (str width &optional start-column)
+;;   "Truncate STR to fit in WIDTH columns.
+;; Optional non-nil arg START-COLUMN specifies the starting column.
+;; \[emu-x20.el; Mule 2.3 emulating function]"
+;;   (or start-column
+;;       (setq start-column 0))
+;;   (substring str start-column width)
+;;   )
 
 
 ;;; @ end