Adjusted for coding system name change.

19 files changed, 165 insertions, 124 deletions

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index f1f41f37a18..9718fe2dcc3 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -34,8 +34,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (make-coding-system
- 'iso-2022-cn 2 ?C
- "Coding system ISO-2022-CN for Chinese (GB and CNS character sets)."
+ 'chinese-iso-7bit 2 ?C
+ "ISO 2022 based 7bit encoding for Chinese GB and CNS (MIME:ISO-2022-CN)"
  '(ascii
    (nil chinese-gb2312 chinese-cns11643-1)
    (nil chinese-cns11643-2)
@@ -44,7 +44,8 @@
    nil ascii-eol ascii-cntl seven locking-shift single-shift nil nil nil
    init-bol))
 
-(define-coding-system-alias 'iso-2022-cn 'iso-2022-cn-ext)
+(define-coding-system-alias 'chinese-iso-7bit 'iso-2022-cn)
+(define-coding-system-alias 'chinese-iso-7bit 'iso-2022-cn-ext)
 
 (define-prefix-command 'describe-chinese-environment-map)
 (define-key-after describe-language-environment-map [Chinese]
@@ -61,21 +62,23 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (make-coding-system
- 'cn-gb-2312 2 ?C
- "Coding-system of Chinese EUC (so called GB Encoding)."
+ 'chinese-iso-8bit 2 ?c
+ "ISO 2022 based EUC encoding for Chinese GB2312 (MIME:CN-GB-2312)"
  '((ascii t) chinese-gb2312 chinese-sisheng nil
    nil ascii-eol ascii-cntl nil nil single-shift nil))
 
-(define-coding-system-alias 'cn-gb-2312 'euc-china)
+(define-coding-system-alias 'chinese-iso-8bit 'cn-gb-2312)
+(define-coding-system-alias 'chinese-iso-8bit 'euc-china)
 
 (make-coding-system
- 'hz-gb-2312 0 ?z
- "Codins-system of Hz/ZW used for Chinese (GB)."
+ 'chinese-hz 0 ?z
+ "Hz/ZW 7-bit encoding for Chinese GB2312 (MIME:HZ-GB-2312)"
  nil)
-(put 'hz-gb-2312 'post-read-conversion 'post-read-decode-hz)
-(put 'hz-gb-2312 'pre-write-conversion 'pre-write-encode-hz)
+(put 'chinese-hz 'post-read-conversion 'post-read-decode-hz)
+(put 'chinese-hz 'pre-write-conversion 'pre-write-encode-hz)
 
-(define-coding-system-alias 'hz-gb-2312 'hz)
+(define-coding-system-alias 'chinese-hz 'hz-gb-2312)
+(define-coding-system-alias 'chinese-hz 'hz)
 
 (defun post-read-decode-hz (len)
   (let ((pos (point)))
@@ -113,7 +116,8 @@
  "Chinese-GB" '((setup-function . (setup-chinese-gb-environment
                                    . setup-chinese-environment-map))
                 (charset . (chinese-gb2312 chinese-sisheng))
-                (coding-system . (cn-gb-2312 hz-gb-2312 iso-2022-cn))
+                (coding-system
+                 . (chinese-iso-8bit chinese-iso-7bit chinese-hz))
                 (sample-text . "Chinese ($AVPND(B,$AFUM(;0(B,$A::So(B)    $ADc:C(B")
                 (documentation . ("Support for Chinese GB2312 character set."
                                   . describe-chinese-environment-map))
@@ -124,10 +128,10 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (make-coding-system
- 'big5 3 ?B
- "Coding-system of BIG5.")
+ 'chinese-big5 3 ?B "BIG5 8-bit encoding for Chinese (MIME:CN-BIG5)")
 
-(define-coding-system-alias 'big5 'cn-big5)
+(define-coding-system-alias 'chinese-big5 'big5)
+(define-coding-system-alias 'chinese-big5 'cn-big5)
 
 ;; Big5 font requires special encoding.
 (define-ccl-program ccl-encode-big5-font
@@ -172,7 +176,7 @@
  "Chinese-BIG5" '((setup-function . (setup-chinese-big5-environment
                                      . setup-chinese-environment-map))
                   (charset . (chinese-big5-1 chinese-big5-2))
-                  (coding-system . (cn-big5 iso-2022-cn))
+                  (coding-system . (chinese-big5 chinese-iso-7bit))
                   (sample-text . "Cantonese ($(0GnM$(B,$(0N]0*Hd(B) $(0*/=((B, $(0+$)p(B")
                   (documentation . ("Support for Chinese Big5 character set."
                                     . describe-chinese-environment-map))
@@ -194,7 +198,7 @@
                              chinese-cns11643-3 chinese-cns11643-4
                              chinese-cns11643-5 chinese-cns11643-6
                              chinese-cns11643-7))
-                 (coding-system . (iso-2022-cn))
+                 (coding-system . (chinese-iso-7bit))
                  (documentation . ("Support for Chinese CNS character sets."
                                    . describe-chinese-environment-map))
                  ))
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index d462e7a289e..c76d5f356bc 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -26,18 +26,17 @@
 
 ;;;###autoload
 (defun setup-cyrillic-iso-environment ()
-  "Setup multilingual environment for Cyrillic (ISO-8859-5) users."
+  "Setup multilingual environment (MULE) for Cyrillic ISO-8859-5 users."
   (interactive)
-  (setup-8-bit-environment 'cyrillic-iso8859-5 'iso-8859-5
+  (setup-8-bit-environment 'cyrillic-iso8859-5 'cyrillic-iso-8bit
                            '("Cyrillic" . "quail-yawerty"))
-
   (setq primary-language "Cyrillic"))
 
 ;;;###autoload
 (defun setup-cyrillic-koi8-environment ()
   "Setup multilingual environment for Cyrillic (KOI8-R) users."
   (interactive)
-  (setup-8-bit-environment 'cyrillic-iso8859-5 'koi8-r
+  (setup-8-bit-environment 'cyrillic-iso8859-5 'cyrillic-koi8
                            '("Cyrillic" . "quail-yawerty"))
 
   (setq primary-language "Cyrillic"))
@@ -46,7 +45,7 @@
 (defun setup-cyrillic-alternativnyj-environment ()
   "Setup multilingual environment for Cyrillic (ALTERNATIVNYJ) users."
   (interactive)
-  (setup-8-bit-environment 'cyrillic-iso8859-5 'alternativnyj
+  (setup-8-bit-environment 'cyrillic-iso8859-5 'cyrillic-alternativnyj
                            '("Cyrillic" . "quail-yawerty"))
 
   (setq primary-language "Cyrillic"))
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 787d6e19278..88489b6d611 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -92,7 +92,7 @@
   "CCL program to encode KOI8.")
              
 (make-coding-system
- 'koi8-r 4
+ 'cyrillic-koi8 4
  ;; We used to use ?K.  It is true that ?K is more strictly correct,
  ;; but it is also used for Korean.
  ;; So people who use koi8 for languages other than Russian
@@ -100,7 +100,8 @@
  ?R "Coding-system used for KOI8."
  (cons ccl-decode-koi8 ccl-encode-koi8))
 
-(define-coding-system-alias 'koi8-r 'koi8)
+(define-coding-system-alias 'cyrillic-koi8 'koi8-r)
+(define-coding-system-alias 'cyrillic-koi8 'koi8)
 
 (define-ccl-program ccl-encode-koi8-font
   '(0
@@ -209,19 +210,19 @@
                   (documentation . (t . describe-cyrillic-environment-map))))
 
 (set-language-info-alist
- "Cyrillic-KOI8" '((setup-function . (setup-cyrillic-iso-environment
+ "Cyrillic-KOI8" '((setup-function . (setup-cyrillic-koi8-environment
                                       . setup-cyrillic-environment-map))
                    (charset . (cyrillic-iso8859-5))
-                   (coding-system . (koi8-4))
+                   (coding-system . (cyrillic-koi8))
                    (sample-text . "Russian (,L@caaZXY(B)      ,L7T`PRabRcYbU(B!")
                    (documentation . (t . describe-cyrillic-environment-map))))
 
 (set-language-info-alist
  "Cyrillic-Alternativnyj" '((setup-function
-                             . (setup-cyrillic-iso-environment
+                             . (setup-cyrillic-alternativnyj-environment
                                 . setup-cyrillic-environment-map))
                             (charset . (cyrillic-iso8859-5))
-                            (coding-system . (alternativnyj))
+                            (coding-system . (cyrillic-alternativnyj))
                             (sample-text . "Russian (,L@caaZXY(B)     ,L7T`PRabRcYbU(B!")
                             (documentation
                              . (t . describe-cyrillic-environment-map))))
diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el
index 1ba694bbced..c14730aebbe 100644
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -48,7 +48,7 @@
 (defun setup-devanagari-environment ()
   "Setup multilingual environment (MULE) for languages using Devanagari."
   (interactive)
-  (setup-8-bit-environment nil 'in-is13194-devanagari
+  (setup-8-bit-environment nil 'devanagari
                            '("Devanagari" . "quail-devanagari-itrans")))
 
 ;;; Basic functions.
diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index f6381f71201..72e2c703144 100644
--- a/lisp/language/devanagari.el
+++ b/lisp/language/devanagari.el
@@ -31,14 +31,16 @@
 ;;; Code:
 
 (make-coding-system
- 'in-is13194-devanagari 2 ?D
- "Coding-system used for ASCII(MSB=0) & IS13194-Devanagari(MSB=1)."
+ 'devanagari 2 ?D
+ "8-bit encoding for ASCII (MSB=0) and IS13194-Devanagari (MSB=1)"
  '((ascii t) (indian-is13194 t) nil nil
    nil ascii-eol))
-devanagari-compose-from-is13194-region
-(put 'in-is13194-devanagari
+
+(define-coding-system-alias 'devanagari 'in-is13194-devanagari)
+
+(put 'devanagari
      'post-read-conversion 'in-is13194-devanagari-post-read-conversion)
-(put 'in-is13194-devanagari
+(put 'devanagari
      'pre-write-conversion 'in-is13194-devanagari-pre-write-conversion)
 
 (register-input-method
@@ -61,7 +63,7 @@ devanagari-compose-from-is13194-region
  "Devanagari" '((setup-function . (setup-devanagari-environment
                                    . setup-indian-environment-map))
                 (charset . (indian-is13194 indian-2-column indian-1-column))
-                (coding-system . (in-is13194-devanagari))
+                (coding-system . (devanagari))
                 (documentation . ("\
 Such languages using Devanagari script as Hindi and Marathi
 are supported in this language environment."
diff --git a/lisp/language/english.el b/lisp/language/english.el
index 34fceebaaf6..74fc77021f7 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -44,25 +44,25 @@ The default status is as follows.
   bound to each category are as follows
         coding category                 coding system
         --------------------------------------------------
-        coding-category-iso-7           iso-2022-7
-        coding-category-iso-8-2         iso-8859-1
-        coding-category-iso-8-1         iso-8859-1
-        coding-category-iso-else        iso-2022-lock
+        coding-category-iso-7           iso-2022-7bit
+        coding-category-iso-8-2         iso-latin-1
+        coding-category-iso-8-1         iso-latin-1
+        coding-category-iso-else        iso-2022-7bit-lock
         coding-category-emacs-mule      emacs-mule
         coding-category-binary          no-conversion
-        coding-category-sjis            sjis
-        coding-category-big5            big5
+        coding-category-sjis            japanese-shift-jis
+        coding-category-big5            chinese-big5
 "
   (interactive)
   (setq-default enable-multibyte-characters t)
 
-  (setq coding-category-iso-7           'iso-2022-7
-        coding-category-iso-8-1         'iso-8859-1
-        coding-category-iso-8-2         'iso-8859-1
-        coding-category-iso-else        'iso-2022-lock
+  (setq coding-category-iso-7           'iso-2022-7bit
+        coding-category-iso-8-1         'iso-latin-1
+        coding-category-iso-8-2         'iso-latin-1
+        coding-category-iso-else        'iso-2022-7bit-lock
         coding-category-emacs-mule      'emacs-mule
-        coding-category-sjis            'sjis
-        coding-category-big5            'big5
+        coding-category-sjis            'japanese-shift-jis
+        coding-category-big5            'chinese-big5
         coding-category-binary          'no-conversion)
 
   (set-coding-priority
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 9c1903a5c59..e68c2e18972 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -47,7 +47,7 @@
         coding-category-iso-8-2 coding-system)
   (set-terminal-coding-system-internal coding-system)
   (set-keyboard-coding-system-internal coding-system)
-  (setq sendmail-coding-system nil
+  (setq sendmail-coding-system coding-system
         rmail-file-coding-system coding-system)
 
   (if charset
@@ -68,13 +68,13 @@
 ;; Latin-1 (ISO-8859-1)
 
 (make-coding-system
- 'iso-8859-1 2 ?1
- "MIME ISO-8859-1 Compound Text Encoding."
+ 'iso-latin-1 2 ?1
+ "ISO 2022 based 8-bit encoding (MIME:ISO-8859-1, Compound Text Encoding)"
  '((ascii t) (latin-iso8859-1 t) nil nil
    nil ascii-eol ascii-cntl))
 
-;; CTEXT is an alias for ISO-8859-1
-(define-coding-system-alias 'iso-8859-1 'ctext)
+(define-coding-system-alias 'iso-latin-1 'iso-8859-1)
+(define-coding-system-alias 'iso-latin-1 'ctext)
 
 (register-input-method "Latin-1"
                        '("quail-latin-1" quail-use-package "quail/latin"))
@@ -82,14 +82,14 @@
 (defun setup-latin1-environment ()
   "Set up multilingual environment (MULE) for European Latin-1 users."
   (interactive)
-  (setup-8-bit-environment 'latin-iso8859-1 'iso-8859-1
+  (setup-8-bit-environment 'latin-iso8859-1 'iso-latin-1
                            '("Latin-1" . "quail-latin-1")))
 
 (set-language-info-alist
  "Latin-1" '((setup-function . (setup-latin1-environment
                                 . setup-european-environment-map))
              (charset . (ascii latin-iso8859-1))
-             (coding-system . (iso-8859-1))
+             (coding-system . (iso-latin-1))
              (sample-text
               . "Hello, Hej, Tere, Hei, Bonjour, Gr,A|_(B Gott, Ciao, ,A!(BHola!")
              (documentation . ("\
@@ -102,24 +102,27 @@ These languages are supported with the Latin-1 (ISO-8859-1) character set:
 ;; Latin-2 (ISO-8859-2)
 
 (make-coding-system
- 'iso-8859-2 2 ?2 "MIME ISO-8859-2"
+ 'iso-latin-2 2 ?2
+ "ISO 2022 based 8-bit encoding (MIME:ISO-8859-2)"
  '((ascii t) (latin-iso8859-2 t) nil nil
    nil ascii-eol ascii-cntl nil nil nil nil))
 
+(define-coding-system-alias 'iso-latin-2 'iso-8859-2)
+
 (register-input-method "Latin-2"
                        '("quail-latin-2" quail-use-package "quail/latin"))
 
 (defun setup-latin2-environment ()
   "Set up multilingual environment (MULE) for European Latin-2 users."
   (interactive)
-  (setup-8-bit-environment 'latin-iso8859-2 'iso-8859-2
+  (setup-8-bit-environment 'latin-iso8859-2 'iso-latin-2
                            '("Latin-2" . "quail-latin-2")))
 
 (set-language-info-alist
  "Latin-2" '((setup-function . (setup-latin2-environment
                                 . setup-european-environment-map))
              (charset . (ascii latin-iso8859-2))
-             (coding-system . (iso-8859-2))
+             (coding-system . (iso-latin-2))
              (documentation . ("\
 These languages are supported with the Latin-2 (ISO-8859-2) character set:
  Albanian, Czech, English, German, Hungarian, Polish, Romanian,
@@ -130,24 +133,27 @@ These languages are supported with the Latin-2 (ISO-8859-2) character set:
 ;; Latin-3 (ISO-8859-3)
 
 (make-coding-system
- 'iso-8859-3 2 ?3 "MIME ISO-8859-3"
+ 'iso-latin-3 2 ?3
+ "ISO 2022 based 8-bit encoding (MIME:ISO-8859-3)"
  '((ascii t) (latin-iso8859-3 t) nil nil
    nil ascii-eol ascii-cntl nil nil nil nil))
 
+(define-coding-system-alias 'iso-latin-3 'iso-8859-3)
+
 (register-input-method "Latin-3"
                        '("quail-latin-3" quail-use-package "quail/latin"))
 
 (defun setup-latin3-environment ()
   "Set up multilingual environment (MULE) for European Latin-3 users."
   (interactive)
-  (setup-8-bit-environment 'latin-iso8859-3 'iso-8859-3
+  (setup-8-bit-environment 'latin-iso8859-3 'iso-latin-3
                            '("Latin-3" . "quail-latin-3")))
 
 (set-language-info-alist
  "Latin-3" '((setup-function . (setup-latin3-environment
                                 . setup-european-environment-map))
              (charset . (ascii latin-iso8859-3))
-             (coding-system . (iso-8859-3))
+             (coding-system . (iso-latin-3))
              (documentation . ("\
 These languages are supported with the Latin-3 (ISO-8859-3) character set:
  Afrikaans, Catalan, Dutch, English, Esperanto, French, Galician,
@@ -158,17 +164,20 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set:
 ;; Latin-4 (ISO-8859-4)
 
 (make-coding-system
- 'iso-8859-4 2 ?4 "MIME ISO-8859-4"
+ 'iso-latin-4 2 ?4
+ "ISO 2022 based 8-bit encoding (MIME:ISO-8859-4)"
  '((ascii t) (latin-iso8859-4 t) nil nil
    nil ascii-eol ascii-cntl nil nil nil nil))
 
+(define-coding-system-alias 'iso-latin-4 'iso-8859-4)
+
 (register-input-method "Latin-4"
                        '("quail-latin-4" quail-use-package "quail/latin"))
 
 (defun setup-latin4-environment ()
   "Set up multilingual environment (MULE) for European Latin-4 users."
   (interactive)
-  (setup-8-bit-environment 'latin-iso8859-4 'iso-8859-4
+  (setup-8-bit-environment 'latin-iso8859-4 'iso-latin-4
                            '("Latin-4" . "quail-latin-4")))
 
 (set-language-info-alist
@@ -186,24 +195,27 @@ These languages are supported with the Latin-4 (ISO-8859-4) character set:
 ;; Latin-5 (ISO-8859-9)
 
 (make-coding-system
- 'iso-8859-9 2 ?9 "MIME ISO-8859-9"
+ 'iso-latin-5 2 ?9
+ "ISO 2022 based 8-bit encoding (MIME:ISO-8859-9)"
  '((ascii t) (latin-iso8859-9 t) nil nil
    nil ascii-eol ascii-cntl nil nil nil nil))
 
+(define-coding-system-alias 'iso-latin-5 'iso-8859-9)
+
 (register-input-method "Latin-5"
                        '("quail-latin-5" quail-use-package "quail/latin"))
 
 (defun setup-latin5-environment ()
   "Set up multilingual environment (MULE) for European Latin-5 users."
   (interactive)
-  (setup-8-bit-environment 'latin-iso8859-9 'iso-8859-9
+  (setup-8-bit-environment 'latin-iso8859-9 'iso-latin-5
                            '("Latin-5" . "quail-latin-5")))
 
 (set-language-info-alist
  "Latin-5" '((setup-function . (setup-latin5-environment
                                 . setup-european-environment-map))
              (charset . (ascii latin-iso8859-9))
-             (coding-system . (iso-8859-9))
+             (coding-system . (iso-latin-5))
              (documentation . ("\
 These languages are supported with the Latin-5 (ISO-8859-9) character set.
 " . describe-european-environment-map))
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index 632ae24a8ae..57bc4f24260 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -29,23 +29,26 @@
 ;;; Code:
 
 (make-coding-system
- 'iso-8859-7 2 ?7 "MIME ISO-8859-7"
+ 'greek-iso-8bit 2 ?7
+ "ISO 2022 based 8-bit encoding for Greek (MIME:ISO-8859-7)"
  '((ascii t) (greek-iso8859-7 t) nil nil
    nil ascii-eol ascii-cntl nil nil nil nil))
 
+(define-coding-system-alias 'greek-iso-8bit 'iso-8859-7)
+
 (register-input-method
  "Greek" '("quail-greek" quail-use-package "quail/greek"))
 
 (defun setup-greek-environment ()
   "Setup multilingual environment (MULE) for Greek."
   (interactive)
-  (setup-8-bit-environment 'greek-iso8859-7 'iso-8859-7
+  (setup-8-bit-environment 'greek-iso8859-7 'greek-iso-8bit
                            '("Greek" . "quail-greek")))
 
 (set-language-info-alist
  "Greek" '((setup-function . setup-greek-environment)
            (charset . (greek-iso8859-7))
-           (coding-system . (iso-8859-7))
+           (coding-system . (greek-iso-8bit))
            (sample-text . "Greek (,FGkk]mija(B)       ,FCei\(B ,Fsar(B")
            (documentation . t)))
 
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index c9aa5678411..7970b5a82e4 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -29,10 +29,13 @@
 ;;; Code:
 
 (make-coding-system
- 'iso-8859-8 2 ?8 "MIME ISO-8859-8"
+ 'hebrew-iso-8bit 2 ?8
+ "ISO 2022 based 8-bit encoding for Hebrew (MIME:ISO-8859-8)"
  '((ascii t) (hebrew-iso8859-8 t) nil nil
    nil ascii-eol ascii-cntl nil nil nil nil nil t))
 
+(define-coding-system-alias 'hebrew-iso-8bit 'iso-8859-8)
+
 (register-input-method
  "Hebrew" '("quail-hebrew" quail-use-package "quail/hebrew"))
 
@@ -40,16 +43,16 @@
   "Setup multilingual environment (MULE) for Hebrew.
 But, please note that right-to-left writing is not yet supported."
   (interactive)
-  (setup-8-bit-environment 'hebrew-iso8859-8 'iso-8859-8
+  (setup-8-bit-environment 'hebrew-iso8859-8 'hebrew-iso-8bit
                            '("Hebrew" . "quail-hebrew")))
 
 (set-language-info-alist
  "Hebrew" '((setup-function . setup-hebrew-environment)
             (describe-function . describe-hebrew-support)
             (charset . (hebrew-iso8859-8))
-            (coding-system . (iso-8859-8))
+            (coding-system . (hebrew-iso-8bit))
             (sample-text . "Hebrew      ,Hylem(B")
             (documentation . "Right-to-left writing is not yet supported.")
             ))
 
-;;; hebew.el ends here
+;;; hebrew.el ends here
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index f99b9f09d73..8b7505567b2 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -29,7 +29,7 @@
   "Setup multilingual environment (MULE) for Japanese."
   (interactive)
   (setup-english-environment)
-  (setq coding-category-iso-8-2 'euc-japan-1990)
+  (setq coding-category-iso-8-2 'japanese-iso-8bit)
 
   (set-coding-priority
    '(coding-category-iso-7
@@ -41,15 +41,16 @@
 
   (if (eq system-type 'ms-dos)
       (progn
-        (setq-default buffer-file-coding-system 'sjis)
-        (set-terminal-coding-system-internal 'sjis)
-        (set-keyboard-coding-system-internal 'sjis)
-        (setq default-process-coding-system '(sjis-dos . sjis-dos)))
-    (setq-default buffer-file-coding-system 'iso-2022-jp)
-    (set-terminal-coding-system-internal 'iso-2022-jp)
-    (set-keyboard-coding-system-internal 'iso-2022-jp))
+        (setq-default buffer-file-coding-system 'japanese-shift-jis)
+        (set-terminal-coding-system-internal 'japanese-shift-jis)
+        (set-keyboard-coding-system-internal 'japanese-shift-jis)
+        (setq default-process-coding-system
+              '(japanese-shift-jis-dos . japanese-shift-jis-dos)))
+    (setq-default buffer-file-coding-system 'iso-2022-7bit)
+    (set-terminal-coding-system-internal 'iso-2022-7bit)
+    (set-keyboard-coding-system-internal 'iso-2022-7bit))
 
-  (set-default-input-method "Japanese" "quail-ja")
+  (setq default-input-method '("Japanese" . "quail-ja"))
 
   (setq sendmail-coding-system 'iso-2022-jp
         rmail-file-coding-system 'iso-2022-jp)
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index b089f02bd25..86998bfc85b 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -29,30 +29,34 @@
 
 ;;; Code:
 
-(define-coding-system-alias 'iso-2022-7 'iso-2022-jp)
-(define-coding-system-alias 'iso-2022-7 'junet)
+(define-coding-system-alias 'iso-2022-7bit 'iso-2022-jp)
+(define-coding-system-alias 'iso-2022-7bit 'junet)
 
 (make-coding-system
- 'shift_jis 1 ?S
- "Coding-system of Shift-JIS used in Japan." t)
+ 'japanese-shift-jis 1 ?S
+ "Shift-JIS 8-bit encoding for Japanese (MIME:SHIFT_JIS)")
 
-(define-coding-system-alias 'shift_jis 'sjis)
+(define-coding-system-alias 'japanese-shift-jis 'shift_jis)
+(define-coding-system-alias 'japanese-shift-jis 'sjis)
 
 (make-coding-system
- 'iso-2022-jp-1978-irv 2 ?J
- "Coding-system used for old jis terminal."
+ 'japanese-iso-7bit-1978-irv 2 ?j
+ "ISO 2022 based 7-bit encoding for Japanese JISX0208-1978 and JISX0201-Roman"
  '((ascii t) nil nil nil
    short ascii-eol ascii-cntl seven nil nil use-roman use-oldjis))
 
-(define-coding-system-alias 'iso-2022-jp-1978-irv 'old-jis)
+(define-coding-system-alias 'japanese-iso-7bit-1978-irv 'iso-2022-jp-1978-irv)
+(define-coding-system-alias 'japanese-iso-7bit-1978-irv 'old-jis)
 
 (make-coding-system
- 'euc-japan-1990 2 ?E
- "Coding-system of Japanese EUC (Extended Unix Code)."
+ 'japanese-iso-8bit 2 ?E
+ "ISO 2022 based EUC encoding for Japanese (MIME:EUC-JP)"
  '(ascii japanese-jisx0208 katakana-jisx0201 japanese-jisx0212
          short ascii-eol ascii-cntl nil nil single-shift))
 
-(define-coding-system-alias 'euc-japan-1990 'euc-japan)
+(define-coding-system-alias 'japanese-iso-8bit 'euc-japan-1990)
+(define-coding-system-alias 'japanese-iso-8bit 'euc-japan)
+(define-coding-system-alias 'japanese-iso-8bit 'euc-jp)
 
 (register-input-method
  "Japanese" '("quail-ja-hiragana" quail-use-package "quail/japanese"))
@@ -65,8 +69,8 @@
               (charset . (japanese-jisx0208 japanese-jisx0208-1978
                           japanese-jisx0212 latin-jisx0201
                           katakana-jisx0201))
-              (coding-system . (euc-japan-1990 sjis
-                                iso-2022-jp iso-2022-jp-1978-irv))
+              (coding-system . (japanese-iso-7bit japanese-iso-8bit
+                                japanese-shift-jis japanese-iso-7bit-1978-irv))
               (sample-text . "Japanese ($BF|K\8l(B)           $B$3$s$K$A$O(B, (I:]FAJ(B")
               (documentation . t)))
 
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index ce3cb97d3f3..c188c17357e 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -29,20 +29,23 @@
 ;;; Code:
 
 (make-coding-system
- 'euc-kr 2 ?K
- "Coding-system of Korean EUC (Extended Unix Code)."
+ 'korean-iso-8bit 2 ?K
+ "ISO 2022 based EUC encoding for Korean KSC5601 (MIME:EUC-KR)"
  '((ascii t) korean-ksc5601 nil nil
    nil ascii-eol ascii-cntl))
 
-(define-coding-system-alias 'euc-kr 'euc-korea)
+(define-coding-system-alias 'korean-iso-8bit 'euc-kr)
+(define-coding-system-alias 'korean-iso-8bit 'euc-korea)
 
 (make-coding-system
- 'iso-2022-kr 2 ?k
- "MIME ISO-2022-KR"
+ 'korean-iso-7bit-lock 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))
 
+(define-coding-system-alias 'korean-iso-7bit-lock 'iso-2022-kr)
+
 (register-input-method
  "Korean" '("quail-hangul" quail-use-package "quail/hangul"))
 (register-input-method
@@ -58,14 +61,14 @@
   "Setup multilingual environment (MULE) for Korean."
   (interactive)
   (setup-english-environment)
-  (setq coding-category-iso-8-2 'euc-kr)
+  (setq coding-category-iso-8-2 'korean-iso-8bit)
 
   (set-coding-priority
    '(coding-category-iso-7
      coding-category-iso-8-2
      coding-category-iso-8-1))
 
-  (setq-default buffer-file-coding-system 'euc-kr)
+  (setq-default buffer-file-coding-system 'korean-iso-8bit)
 
   (setq default-input-method '("Korean" . "quail-hangul"))
   )
@@ -74,7 +77,7 @@
  "Korean" '((setup-function . setup-korean-environment)
             (tutorial . "TUTORIAL.kr")
             (charset . (korean-ksc5601))
-            (coding-system . (euc-kr iso-2022-kr))
+            (coding-system . (korean-iso-7bit-lock korean-iso-8bit))
             (sample-text . "Hangul ($(CGQ1[(B)        $(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B")
             (documentation . t)))
 
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index b10e341b353..8f50bdecea6 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -28,7 +28,7 @@
 (defun setup-lao-environment ()
   "Setup multilingual environment (MULE) for Lao."
   (interactive)
-  (setup-8-bit-environment 'lao 'iso-2022-7
+  (setup-8-bit-environment 'lao 'iso-2022-7bit
                            '("Lao" . "quail-lao")))
 
 (let ((l '((?(1!(B consonant "LETTER KOR  KAI'" "CHICKEN")
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index 39a19eb6d05..38a55d0c5a9 100644
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -25,8 +25,8 @@
 ;;; Code:
 
 (make-coding-system
- 'lao 2 ?T
- "Coding-system used for ASCII(MSB=0) & LAO(MSB=1)."
+ 'lao 2 ?L
+ "8-bit encoding for ASCII (MSB=0) and LAO (MSB=1)"
  '((ascii t) (lao t) nil nil
    nil ascii-eol))
 
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index 9fef5b5591b..4c3e0bc62de 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -28,7 +28,7 @@
 (defun setup-thai-environment ()
   "Setup multilingual environment (MULE) for Thai."
   (interactive)
-  (setup-8-bit-environment 'thai-tis620 'th-tis620
+  (setup-8-bit-environment 'thai-tis620 'thai-tis620
                            '("Thai" . "quail-thai")))
 
 ;; Setting information of Thai characters.
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index badf98aa534..3c94b7df7f0 100644
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -29,14 +29,15 @@
 ;;; Code:
 
 (make-coding-system
- 'th-tis620 2 ?T
- "Coding-system used for ASCII(MSB=0) & TIS620(MSB=1)."
+ 'thai-tis620 2 ?T
+ "8-bit encoding for ASCII (MSB=0) and Thai TIS620 (MSB=1)"
  '((ascii t) (thai-tis620 t) nil nil
    nil ascii-eol))
-(put 'th-tis620 'post-read-conversion 'thai-post-read-conversion)
-(put 'th-tis620 'pre-write-conversion 'thai-pre-write-conversion)
+(put 'thai-tis620 'post-read-conversion 'thai-post-read-conversion)
+(put 'thai-tis620 'pre-write-conversion 'thai-pre-write-conversion)
 
-(define-coding-system-alias 'th-tis620 'tis620)
+(define-coding-system-alias 'thai-tis620 'th-tis620)
+(define-coding-system-alias 'thai-tis620 'tis620)
 
 (register-input-method
  "Thai" '("quail-thai" quail-use-package "quail/thai"))
@@ -45,7 +46,7 @@
  "Thai" '((tutorial . "TUTORIAL.th")
           (setup-function . setup-thai-environment)
           (charset . (thai-tis620))
-          (coding-system . (th-tis620))
+          (coding-system . (thai-tis620))
           (sample-text . "Thai (,T@RIRd7B(B)          ,TJ0GQ1J04U1$0CQ1:(B, ,TJ0GQ1J04U10$h1P(B")
           (documentation . t)))
 
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index cfea18393ea..482939b188d 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -90,7 +90,7 @@
 
 (make-coding-system
  'tibetan 2 ?Q
- "Coding-system used for ASCII(MSB=0) & TIBETAN(MSB=1)."
+ "8-bit encoding for ASCII (MSB=0) and TIBETAN (MSB=1)"
  '((ascii t) (tibetan t) nil nil
    nil ascii-eol))
 
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index 9c665846556..bdb3ecfaa87 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -36,9 +36,10 @@
 ;;; Code:
 
 (defun setup-vietnamese-environment ()
-  "Setup multilingual environment (MULE) for Vietnamese."
+  "Setup multilingual environment (MULE) for Vietnamese VISCII users."
   (interactive)
-  (setup-8-bit-environment nil 'viscii  '("Vietnamese" . "quail-viqr")))
+  (setup-8-bit-environment nil 'vietnamese-viscii
+                           '("Vietnamese" . "quail-viqr")))
 
 ;; VIQR is a menmonic encoding specification for Vietnamese.
 ;; It represents diacritical marks by ASCII characters as follows:
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index a8e1635ecd9..6fbd58cdafe 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -201,21 +201,27 @@ Both tables are indexed by the position code of Vietnamese characters.")
 
 
 (make-coding-system
- 'viscii 4 ?V
- "Coding-system used for VISCII 1.1."
+ 'vietnamese-viscii 4 ?V
+ "8-bit encoding for Vietnamese VISCII 1.1 (MIME:VISCII)"
  (cons ccl-decode-viscii ccl-encode-viscii))
 
+(define-coding-system-alias 'vietnamese-viscii 'viscii)
+
 (make-coding-system
- 'vscii 4 ?V
- "Coding-system used for VSCII-1."
+ 'vietnamese-vscii 4 ?v
+ "8-bit encoding for Vietnamese VSCII-1"
  (cons ccl-decode-vscii ccl-encode-vscii))
 
+(define-coding-system-alias 'vietnamese-vscii 'vscii)
+
 (make-coding-system
- 'viqr 0 ?v
- "Codins-system used for VIQR."
+ 'vietnamese-viqr 0 ?q
+ "Vietnamese latin transcription (VIQR)"
  nil)
-(put 'viqr 'post-read-conversion 'viqr-post-read-conversion)
-(put 'viqr 'pre-write-conversion 'viqr-pre-write-conversion)
+(put 'vietnamese-viqr 'post-read-conversion 'viqr-post-read-conversion)
+(put 'vietnamese-viqr 'pre-write-conversion 'viqr-pre-write-conversion)
+
+(define-coding-system-alias 'vietnamese-viqr 'viqr)
 
 (setq font-ccl-encoder-alist
       (cons (cons "viscii" ccl-encode-viscii-font) font-ccl-encoder-alist))
@@ -230,7 +236,8 @@ Both tables are indexed by the position code of Vietnamese characters.")
  "Vietnamese" '((setup-function . setup-vietnamese-environment)
                 (charset . (vietnamese-viscii-lower
                             vietnamese-viscii-upper))
-                (coding-system . (viscii vscii viqr))
+                (coding-system . (vietnamese-viscii vietnamese-vscii
+                                  vietnamese-viqr))
                 (sample-text . "Vietnamese (Ti,1*(Bng Vi,1.(Bt)     Ch,1`(Bo b,1U(Bn")
                 (documentation . "\
 For Vietnamese, Emacs uses special charasets internally.