(iso-2022-jp-2): New coding system.

("Japanese"): Put iso-2022-jp-2 in coding-priority property.

diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 220f429ad0a43ff25e9fa01f2d7c588691ee700c..8662fdc43b47de38a5986ebe090b985d1a4c636f 100644 (file)
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -41,6 +41,20 @@
 
 (define-coding-system-alias 'junet 'iso-2022-jp)
 
+(make-coding-system
+ 'iso-2022-jp-2 2 ?J
+ "ISO 2022 based 7bit encoding for CJK, Latin-1, and Greek (MIME:ISO-2022-JP-2)"
+ '((ascii japanese-jisx0208-1978 japanese-jisx0208
+         latin-jisx0201 japanese-jisx0212 katakana-jisx0201
+         chinese-gb2312 korean-ksc5601) nil
+         (nil latin-iso8859-1 greek-iso8859-7) nil
+ short ascii-eol ascii-cntl seven nil single-shift)
+ '((safe-charsets ascii japanese-jisx0208-1978 japanese-jisx0208
+                 latin-jisx0201 japanese-jisx0212 katakana-jisx0201
+                 chinese-gb2312 korean-ksc5601
+                 latin-iso8859-1 greek-iso8859-7)
+   (mime-charset . iso-2022-jp-2)))
+
 (make-coding-system
  'japanese-shift-jis 1 ?S
  "Shift-JIS 8-bit encoding for Japanese (MIME:SHIFT_JIS)"
@@ -87,7 +101,7 @@
              (coding-system iso-2022-jp japanese-iso-8bit
                             japanese-shift-jis japanese-iso-7bit-1978-irv)
              (coding-priority iso-2022-jp japanese-iso-8bit
-                              japanese-shift-jis)
+                              japanese-shift-jis iso-2022-jp-2)
              (input-method . "japanese")
              (features japan-util)
              (sample-text . "Japanese (\e$BF|K\8l\e(B)   \e$B$3$s$K$A$O\e(B, \e(I:]FAJ\e(B")