Sync up with r21-4-21-chise-0_24-shinjigen-2-p.

[chise/xemacs-chise.git-] / lisp / mule / mule-coding.el

diff --git a/lisp/mule/mule-coding.el b/lisp/mule/mule-coding.el
index c0a951b..118f675 100644 (file)
--- a/lisp/mule/mule-coding.el
+++ b/lisp/mule/mule-coding.el
@@ -4,7 +4,7 @@
 ;; Licensed to the Free Software Foundation.
 ;; Copyright (C) 1995 Amdahl Corporation.
 ;; Copyright (C) 1995 Sun Microsystems.
-;; Copyright (C) 1997,1999,2002,2003,2004 MORIOKA Tomohiko
+;; Copyright (C) 1997,1999,2002,2003,2004,2005,2006 MORIOKA Tomohiko
 
 ;; This file is part of XEmacs.
 
@@ -124,12 +124,20 @@
 (make-coding-system
  'iso-2022-jp-2 'iso2022
  "ISO-2022 coding system using SS2 for 96-charset in 7-bit code."
- '(charset-g0 ascii
-   charset-g2 t ;; unspecified but can be used later.
-   seven t
-   short t
-   mnemonic "ISO7/SS"
-   eol-type nil))
+ (let ((conf
+       '(charset-g0 ascii
+          charset-g2 t ;; unspecified but can be used later.
+         seven t
+         short t
+         mnemonic "ISO7/SS"
+         eol-type nil)))
+   (if (featurep 'utf-2000)
+       (list* 'ccs-priority-list
+             '(ascii
+               =jis-x0208@1983 =jis-x0208@1978
+               latin-jisx0201)
+             conf)
+     conf)))
 
 (make-coding-system
  'iso-2022-7bit 'iso2022
@@ -230,6 +238,7 @@
          ((ipa                 . isolated) "I-MULE-IPA-" 2 X)
          ((china3-jef          . isolated)    "I-JC3-" 4 X)
          ( ideograph-gt                          "GT-" 5 d)
+         ( =zinbun-oracle                       "ZOB-" 4 d)
          ( =ruimoku-v6                         "RUI6-" 4 X)
          ( chinese-big5-cdp                     "CDP-" 4 X)
          ( ideograph-daikanwa                     "M-" 5 d)
@@ -291,10 +300,10 @@
          ( china3-jef                           "JC3-" 4 X)
          ( chinese-big5                           "B-" 4 X)
          ( chinese-big5                          "C0-" 4 X)
+         ( =ucs@iso                               "U-" 8 X)
          ( =ucs@unicode                          "UU+" 4 X)
          ( =ucs@unicode                          "UU-" 8 X)
          ( =ucs@iso                               "U+" 4 X)
-         ( =ucs@iso                               "U-" 8 X)
          ( =ucs@gb                               "GU+" 4 X)
          ( =ucs@gb                               "GU-" 8 X)
          ( =ucs@jis                              "JU+" 4 X)
@@ -304,6 +313,7 @@
          ( =ucs@ks                               "KU+" 4 X)
          ( =ucs@ks                               "KU-" 8 X)
          ( =jis-x0208@1997                      "J97-" 4 X)
+         ( =jis-x0208@1978/i1                 "J78i1-" 4 X)
          ))
 
   (make-coding-system