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

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

1 files changed, 15 insertions, 1 deletions

diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 220f429ad0a..8662fdc43b4 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -42,6 +42,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)"
  nil
@@ -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 ($BF|K\8l(B)   $B$3$s$K$A$O(B, (I:]FAJ(B")