Adjusted for the change of make-coding-system. Register

coding-priority key in language-info-alist.

diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index c109d487994aec6c8cc98caeffc461f2f0e776d5..fc248938d66145f503865365bea63355de581847 100644 (file)
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -33,9 +33,11 @@
  'iso-2022-jp 2 ?J
  "ISO 2022 based 7bit encoding for Japanese (MIME:ISO-2022-JP)"
  '((ascii japanese-jisx0208-1978 japanese-jisx0208
-         latin-jisx0201 japanese-jisx0212 katakana-jisx0201 t) nil nil nil
+         latin-jisx0201 japanese-jisx0212 katakana-jisx0201) nil nil nil
    short ascii-eol ascii-cntl seven)
- '(ascii japanese-jisx0208-1978 japanese-jisx0208 latin-jisx0201))
+ '((safe-charsets ascii japanese-jisx0208-1978 japanese-jisx0208
+                 latin-jisx0201 japanese-jisx0212 katakana-jisx0201)
+   (mime-charset . 'iso-2022-jp)))
 
 (define-coding-system-alias 'junet 'iso-2022-jp)
 
@@ -43,8 +45,9 @@
  'japanese-shift-jis 1 ?S
  "Shift-JIS 8-bit encoding for Japanese (MIME:SHIFT_JIS)"
  nil
- '(ascii japanese-jisx0208 japanese-jisx0208-1978
-        latin-jisx0201 katakana-jisx0201))
+ '((safe-charsets ascii japanese-jisx0208 japanese-jisx0208-1978
+                 latin-jisx0201 katakana-jisx0201)
+   (mime-charset . shift_jis)))
 
 (define-coding-system-alias 'shift_jis 'japanese-shift-jis)
 (define-coding-system-alias 'sjis 'japanese-shift-jis)
@@ -63,11 +66,11 @@
 (make-coding-system
  'japanese-iso-8bit 2 ?E
  "ISO 2022 based EUC encoding for Japanese (MIME:EUC-JP)"
- '((ascii latin-jisx0201) (japanese-jisx0208 japanese-jisx0208-1978)
-   katakana-jisx0201 japanese-jisx0212
+ '(ascii japanese-jisx0208 katakana-jisx0201 japanese-jisx0212
    short ascii-eol ascii-cntl nil nil single-shift)
- '(ascii latin-jisx0201 japanese-jisx0208 japanese-jisx0208-1978
-   katakana-jisx0201 japanese-jisx0212))
+ '((safe-charsets ascii latin-jisx0201 japanese-jisx0208 japanese-jisx0208-1978
+                katakana-jisx0201 japanese-jisx0212)
+   (mime-charset . euc-jp)))
 
 (define-coding-system-alias 'euc-japan-1990 'japanese-iso-8bit)
 (define-coding-system-alias 'euc-japan 'japanese-iso-8bit)
@@ -76,12 +79,13 @@
 (set-language-info-alist
  "Japanese" '((setup-function . setup-japanese-environment)
              (tutorial . "TUTORIAL.jp")
-             (charset . (japanese-jisx0208 japanese-jisx0208-1978
-                         japanese-jisx0212 latin-jisx0201
-                         katakana-jisx0201))
-             (coding-system . (iso-2022-jp japanese-iso-8bit
-                               japanese-shift-jis japanese-iso-7bit-1978-irv))
-             (sample-text . "Japanese (\e$BF|K\8l\e(B)           \e$B$3$s$K$A$O\e(B, \e(I:]FAJ\e(B")
+             (charset japanese-jisx0208 japanese-jisx0208-1978
+                      japanese-jisx0212 latin-jisx0201 katakana-jisx0201)
+             (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)
+             (sample-text . "Japanese (\e$BF|K\8l\e(B)   \e$B$3$s$K$A$O\e(B, \e(I:]FAJ\e(B")
              (documentation . t)))
 
 ;;; japanese.el ends here

diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index ded33c2b028c09b7b2eaf945955ae2ace8f93ff1..4ecf7b853900bf0f0222fd76c9633d215c1a8bb0 100644 (file)
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -31,31 +31,35 @@
 (make-coding-system
  'korean-iso-8bit 2 ?K
  "ISO 2022 based EUC encoding for Korean KSC5601 (MIME:EUC-KR)"
- '((ascii t) korean-ksc5601 nil nil
+ '(ascii korean-ksc5601 nil nil
    nil ascii-eol ascii-cntl)
- '(ascii korean-ksc5601))
+ '((safe-charsets ascii korean-ksc5601)
+   (mime-charset . euc-kr)))
 
 (define-coding-system-alias 'euc-kr 'korean-iso-8bit)
 (define-coding-system-alias 'euc-korea 'korean-iso-8bit)
 
 (make-coding-system
- 'korean-iso-7bit-lock 2 ?k
+ 'iso-2022-kr 2 ?k
  "ISO 2022 based 7-bit encoding for Korean KSC5601 (MIME:ISO-2022-KR)."
  '(ascii (nil korean-ksc5601) nil nil
         nil ascii-eol ascii-cntl seven locking-shift nil nil nil nil nil
         designation-bol)
- '(ascii korean-ksc5601))
+ '((safe-charsets ascii korean-ksc5601)
+   (mime-charset . iso-2022-kr)))
 
-(define-coding-system-alias 'iso-2022-kr 'korean-iso-7bit-lock)
+(define-coding-system-alias 'korean-iso-7bit-lock 'iso-2022-kr)
 
 (set-language-info-alist
  "Korean" '((setup-function . setup-korean-environment)
            (exit-function . exit-korean-environment)
            (tutorial . "TUTORIAL.kr")
-           (charset . (korean-ksc5601))
-           (coding-system . (korean-iso-7bit-lock korean-iso-8bit))
+           (charset korean-ksc5601)
+           (coding-system iso-2022-kr korean-iso-8bit)
+           (coding-priority korean-iso-8bit iso-2022-kr)
            (sample-text . "Hangul (\e$(CGQ1[\e(B)        \e$(C>H3gGO<<?d\e(B, \e$(C>H3gGO=J4O1n\e(B")
-           (documentation . "The following key bindings are avairable:
+           (documentation . "\
+The following key bindings are avairable while using Korean input methods:
   Shift-SPC:   toggle-korean-input-mthod
   Control-F9:  quail-hangul-switch-symbol-ksc
   F9:          quail-hangul-switch-hanja")

diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index e9bde98663cfcab56b0576bbc870e7e4d15321ac..175ced0f817224518eb611488a22f30ce4746cab 100644 (file)
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -27,14 +27,15 @@
 (make-coding-system
  'lao 2 ?L
  "8-bit encoding for ASCII (MSB=0) and LAO (MSB=1)"
- '((ascii t) (lao t) nil nil
-   nil ascii-eol)
- '(ascii lao))
+ '(ascii lao nil nil
+   nil nil)
+ '((safe-charsets ascii lao)))
 
 (set-language-info-alist
  "Lao" '((setup-function . setup-lao-environment)
-        (charset . (lao))
-        (coding-system . (lao))
+        (charset lao)
+        (coding-system lao)
+        (coding-priority lao)
         (sample-text . "Lao(\e(1>RJRERG\e(B)            \e(1JP:R-\e04U\e1\e(B, \e0\e(1"i\e1M-`\e0;Q\e19\e0$[\e19ERG\e(B")
         (documentation . t)))
 

diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index a96c7cceef7d741797c11e390a6cc5ee014b260e..6ee6d8780bf1714ad020d9083e444319cae5f7d3 100644 (file)
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -31,13 +31,11 @@
 (make-coding-system
  'thai-tis620 2 ?T
  "8-bit encoding for ASCII (MSB=0) and Thai TIS620 (MSB=1)"
- '((ascii t) (thai-tis620 t) nil nil
+ '(ascii thai-tis620 nil nil
    nil ascii-eol)
- '(ascii thai-tis620))
-(coding-system-put 'thai-tis620 'post-read-conversion
-                  'thai-post-read-conversion)
-(coding-system-put 'thai-tis620 'pre-write-conversion
-                  'thai-pre-write-conversion)
+ '((safe-charsets ascii thai-tis620)
+   (post-read-conversion . thai-post-read-conversion)
+   (pre-write-conversion . thai-pre-write-conversion)))
 
 (define-coding-system-alias 'th-tis620 'thai-tis620)
 (define-coding-system-alias 'tis620 'thai-tis620)
@@ -45,9 +43,10 @@
 (set-language-info-alist
  "Thai" '((tutorial . "TUTORIAL.th")
          (setup-function . setup-thai-environment)
-         (charset . (thai-tis620))
-         (coding-system . (thai-tis620))
-         (sample-text . "Thai (\e,T@RIRd7B\e(B)          \e,TJ\e0GQ\e1J\e04U\e1$\e0CQ\e1:\e(B, \e,TJ\e0GQ\e1J\e04U\e1\e0$h\e1P\e(B")
+         (charset thai-tis620)
+         (coding-system thai-tis620)
+         (coding-priority thai-tis620)
+         (sample-text . "Thai (\e,T@RIRd7B\e(B)          \e,TJ\e(B\e0\e,TGQ\e(B\e1\e,TJ\e(B\e0\e,T4U\e(B\e1\e,T$\e(B\e0\e,TCQ\e(B\e1\e,T:\e(B, \e,TJ\e(B\e0\e,TGQ\e(B\e1\e,TJ\e(B\e0\e,T4U\e(B\e1\e0\e,T$h\e(B\e1\e,TP\e(B")
          (documentation . t)))
 
 ;;; thai.el ends here

diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 1b1767a561aff76b53d5dc68fd5f8216daaad153..5aded387bde8469265c992c84b9e53311796b1a8 100644 (file)
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -89,21 +89,21 @@
 
 
 (make-coding-system
- 'tibetan 2 ?Q
+ 'tibetan-iso-8bit 2 ?Q
  "8-bit encoding for ASCII (MSB=0) and TIBETAN (MSB=1)"
- '((ascii t) (tibetan t) nil nil
-   nil ascii-eol)
- '(ascii tibetan))
+ '(ascii tibetan nil nil
+   nil nil)
+ '((safe-charsets ascii tibetan)
+   (post-read-conversion . tibetan-post-read-conversion)
+   (pre-write-conversion . tibetan-pre-write-conversion)))
 
-(coding-system-put 'tibetan 'post-read-conversion
-                  'tibetan-post-read-conversion)
-(coding-system-put 'tibetan 'pre-write-conversion
-                  'tibetan-pre-write-conversion)
+(define-coding-system-alias 'tibetan 'tibetan-iso-8bit)
 
 (set-language-info-alist
  "Tibetan" '((setup-function . setup-tibetan-environment)
-            (charset . (tibetan tibetan-1-column))
-            (coding-system . (tibetan))
+            (charset tibetan tibetan-1-column)
+            (coding-system tibetan-iso-8bit)
+            (coding-priority iso-2022-7bit tibetan-iso-8bit)
             (documentation . t)
             (sample-text .
 "Tibetan (\e2\e$(7"70"]\e1"2\e$(8!;\e2\e$(7%P`"Q\e1"2\e$(8!;\e(B) \e2\e$(7#RP#SP#S\e1!>"7\e2$P`"Q\e1\e$(8!;\e2\e$(7"E0"S\e1"G\e$(8!;\e$(7"7\e2"20"[\e1\e$(8!;\e2\e$(7"D0"[\e1"#"G!>\e2"I0"]0"_\e1\e$(8!;\e2\e$(7"9`"Q\e1\e$(8!;\e2\e$(7"/0"S\e1\e$(8!;\e2\e$(7"5`"Q\e1\e2#2`#90"[\e1\e$(8!;\e2\e$(7"H`#A`"U0"c\e1!>\e(B")))

diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index 5181155e52f775ff9841a101d59d61b919f82681..8b24c313fe57bec1effcf8a411bfd04d27ca0df9 100644 (file)
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -204,7 +204,8 @@ Both tables are indexed by the position code of Vietnamese characters.")
  'vietnamese-viscii 4 ?V
  "8-bit encoding for Vietnamese VISCII 1.1 (MIME:VISCII)"
  (cons ccl-decode-viscii ccl-encode-viscii)
- '(ascii vietnamese-viscii-lower vietnamese-viscii-upper))
+ '((safe-charsets ascii vietnamese-viscii-lower vietnamese-viscii-upper)
+   (mime-charset . viscii)))
 
 (define-coding-system-alias 'viscii 'vietnamese-viscii)
 
@@ -212,7 +213,7 @@ Both tables are indexed by the position code of Vietnamese characters.")
  'vietnamese-vscii 4 ?v
  "8-bit encoding for Vietnamese VSCII-1"
  (cons ccl-decode-vscii ccl-encode-vscii)
- '(ascii vietnamese-viscii-lower vietnamese-viscii-upper))
+ '((safe-charsets ascii vietnamese-viscii-lower vietnamese-viscii-upper)))
 
 (define-coding-system-alias 'vscii 'vietnamese-vscii)
 
@@ -220,11 +221,9 @@ Both tables are indexed by the position code of Vietnamese characters.")
  'vietnamese-viqr 0 ?q
  "Vietnamese latin transcription (VIQR)"
  nil
- '(ascii vietnamese-viscii-lower vietnamese-viscii-upper))
-(coding-system-put 'vietnamese-viqr 'post-read-conversion
-                  'viqr-post-read-conversion)
-(coding-system-put 'vietnamese-viqr 'pre-write-conversion
-                  'viqr-pre-write-conversion)
+ '((safe-charsets ascii vietnamese-viscii-lower vietnamese-viscii-upper)
+   (post-read-conversion . viqr-post-read-conversion)
+   (pre-write-conversion . viqr-pre-write-conversion)))
 
 (define-coding-system-alias 'viqr 'vietnamese-viqr)
 
@@ -236,14 +235,16 @@ Both tables are indexed by the position code of Vietnamese characters.")
 
 (set-language-info-alist
  "Vietnamese" '((setup-function . setup-vietnamese-environment)
-               (charset . (vietnamese-viscii-lower
-                           vietnamese-viscii-upper))
-               (coding-system . (vietnamese-viscii vietnamese-vscii
-                                 vietnamese-viqr))
+               (charset vietnamese-viscii-lower vietnamese-viscii-upper)
+               (coding-system vietnamese-viscii vietnamese-vscii
+                              vietnamese-viqr)
+               (coding-priority vietnamese-viscii)
                (sample-text . "Vietnamese (Ti\e,1*\e(Bng Vi\e,1.\e(Bt)     Ch\e,1`\e(Bo b\e,1U\e(Bn")
                (documentation . "\
 For Vietnamese, Emacs uses special charasets internally.
-They can be decoded from and encoded to VISCC, VSCII, and VIQR.")
+They can be decoded from and encoded to VISCC, VSCII, and VIQR.
+Current setting put higher priority to the coding system VISCII than VSCII.
+If you prefer VSCII, please do: (prefer-coding-system 'vietnamese-vscii)")
                ))
 
 ;;; vietnamese.el ends here