From: tomo <tomo>
Date: Mon, 28 Feb 2005 18:02:58 +0000 (+0000)
Subject: (iso-2022-jp): Specify `ccs-priority-list' in XEmacs CHISE; don't
X-Git-Tag: r21-4-15-chise-0_22^2~325
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f40cd0f0c561d0c09be1248028a374c940a89b10;p=chise%2Fxemacs-chise.git-

(iso-2022-jp): Specify `ccs-priority-list' in XEmacs CHISE; don't
specify `input-charset-conversion' in XEmacs CHISE.
---

diff --git a/lisp/mule/japanese.el b/lisp/mule/japanese.el
index 5628f9f..b8b4e25 100644
--- a/lisp/mule/japanese.el
+++ b/lisp/mule/japanese.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 1997,1999,2002,2004 MORIOKA Tomohiko
+;; Copyright (C) 1997,1999,2002,2004,2005 MORIOKA Tomohiko
 
 ;; Keywords: multilingual, Japanese
 
@@ -157,13 +157,21 @@
 (make-coding-system
  'iso-2022-jp 'iso2022
  "Coding-system used for communication with mail and news in Japan."
- '(charset-g0 ascii
-   short t
-   seven t
-   input-charset-conversion ((latin-jisx0201 ascii)
-			     (japanese-jisx0208-1978 japanese-jisx0208))
-   mnemonic "MULE/7bit"
-   ))
+ (let ((conf
+	'(charset-g0 ascii
+	  short t
+	  seven t
+	  mnemonic "MULE/7bit")))
+   (if (featurep 'utf-2000)
+       (list* 'ccs-priority-list
+	      '(ascii
+		=jis-x0208@1983 =jis-x0208@1978
+		latin-jisx0201)
+	      conf)
+     (list* 'input-charset-conversion
+	    '((latin-jisx0201 ascii)
+	      (japanese-jisx0208-1978 japanese-jisx0208))
+	    conf))))
 
 (define-coding-system-alias 'junet 'iso-2022-jp)