Coding system names changed as follows:

internal -> emacs-mule, automatic-conversion -> undecided.
Coding category name changes as follows:
coding-category-internal -> coding-category-emacs-mule.
Delete functions describe-LANGUAGE-support.
Delete describe-function entries and change documentation
entries in each language specific information.

14 files changed, 30 insertions, 128 deletions

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index e7de1e8c532..ab95c4f09c3 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -46,21 +46,13 @@
 
 (define-coding-system-alias 'iso-2022-cn 'iso-2022-cn-ext)
 
-(defun describe-chinese-support ()
-  "Describe how Emacs supports Chinese."
-  (interactive)
-  (with-output-to-temp-buffer "*Help*"
-    (princ (get-language-info "Chinese" 'documentation))
-    (princ "\n")))
-           
 (set-language-info-alist
- "Chinese" '((describe-function . describe-chinese-support)
-             (documentation . "\
+ "Chinese" '((documentation . "\
 Emacs provides the following three kinds of Chinese support:
   Chinese-GB: for users of the charset GB2312
   Chinese-BIG5: for users of the charset Big5
   Chinese-CNS: for users of the charset CNS11643 family
-Please specify one of them to get more information.")
+Please specify/select one of them to get more information.")
              ))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -131,7 +123,7 @@ Please specify one of them to get more information.")
      coding-category-iso-8-2
      coding-category-big5
      coding-category-iso-8-1
-     coding-category-internal
+     coding-category-emacs-mule
      ))
 
   (setq-default buffer-file-coding-system 'cn-gb-2312)
@@ -141,18 +133,12 @@ Please specify one of them to get more information.")
   (setq default-input-method '("Chinese-GB" . "quail-py"))
   )
 
-(defun describe-chinese-gb-support ()
-  "Describe how Emacs supports Chinese for GB2312 users."
-  (interactive)
-  (describe-language-support-internal "Chinese-GB"))
-
 (set-language-info-alist
  "Chinese-GB" '((setup-function . setup-chinese-gb-environment)
-                (describe-function . describe-chinese-gb-support)
                 (charset . (chinese-gb2312 chinese-sisheng))
                 (coding-system . (cn-gb-2312 hz-gb-2312 iso-2022-cn))
                 (sample-text . "Chinese ($AVPND(B,$AFUM(;0(B,$A::So(B)    $ADc:C(B")
-                (documentation . nil)))
+                (documentation . t)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Chinese BIG5 (traditional)
@@ -225,18 +211,12 @@ Please specify one of them to get more information.")
   (setq default-input-method '("Chinese-BIG5" . "quail-py-b5"))
   )
 
-(defun describe-chinese-big5-support ()
-  "Describe how Emacs supports Chinese for Big5 users."
-  (interactive)
-  (describe-language-support-internal "Chinese-BIG5"))
-
 (set-language-info-alist
  "Chinese-BIG5" '((setup-function . setup-chinese-big5-environment)
-                  (describe-function . describe-chinese-big5-support)
                   (charset . (chinese-big5-1 chinese-big5-2))
                   (coding-system . (cn-big5 iso-2022-cn))
                   (sample-text . "Cantonese ($(0GnM$(B,$(0N]0*Hd(B) $(0*/=((B, $(0+$)p(B")
-                  (documentation . nil)))
+                  (documentation . t)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Chinese CNS11643 (traditional)
@@ -269,19 +249,13 @@ Please specify one of them to get more information.")
   (setq default-input-method '("Chinese-CNS" . "quail-quick-cns"))
   )
 
-(defun describe-chinese-cns-support ()
-  "Describe how Emacs supports Chinese for CNS11643 family users."
-  (interactive)
-  (describe-language-support-internal "Chinese-CNS"))
-
 (set-language-info-alist
  "Chinese-CNS" '((setup-function . setup-chinese-cns-environment)
-                 (describe-function . describe-chinese-cns-support)
                  (charset . (chinese-cns11643-1 chinese-cns11643-2
                              chinese-cns11643-3 chinese-cns11643-4
                              chinese-cns11643-5 chinese-cns11643-6
                              chinese-cns11643-7))
                  (coding-system . (iso-2022-cn))
-                 (documentation . nil)))
+                 (documentation . t)))
 
 ;;; chinese.el ends here
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 3646521e003..737fefb39e9 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -204,17 +204,11 @@
   (setq default-input-method '("Cyrillic" . "quail-yawerty"))
   )
 
-(defun describe-cyrillic-support ()
-  "Describe how Emacs support Cyrillic."
-  (interactive)
-  (describe-language-support-internal "Cyrillic"))
-
 (set-language-info-alist
  "Cyrillic" '((setup-function . setup-cyrillic-environment)
-              (describe-function . describe-cyrillic-support)
               (charset . (cyrillic-iso8859-5))
               (coding-system . (iso-8859-5 koi8 alternativnyj))
               (sample-text . "Russian (,L@caaZXY(B)   ,L7T`PRabRcYbU(B!")
-              (documentation . nil)))
+              (documentation . t)))
 
 ;;; cyrillic.el ends here
diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index 9fd47c57607..ada8a8f4821 100644
--- a/lisp/language/devanagari.el
+++ b/lisp/language/devanagari.el
@@ -71,17 +71,11 @@ devanagari-compose-from-is13194-region
   (setq default-input-method '("Devanagari" . "quail-devanagari-itrans"))
   )
 
-(defun describe-devanagari-support ()
-  "Describe how Emacs support languages using Devanagari script."
-  (interactive)
-  (describe-language-support-internal "Devanagari"))
-
 (set-language-info-alist
  "Devanagari" '((setup-function . setup-devanagari-environment)
-                (describe-function . describe-devanagari-support)
                 (charset . (indian-is13194 indian-2-column indian-1-column))
                 (coding-system . (in-is13194-devanagari))
-                (documentation . nil)))
+                (documentation . t)))
 
 ;;
 ;; Devanagari Glyph List
diff --git a/lisp/language/english.el b/lisp/language/english.el
index 8e5d3c8d64e..76d08f47297 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -48,7 +48,7 @@ The default status is as follows.
         coding-category-iso-8-2         iso-8859-1
         coding-category-iso-8-1         iso-8859-1
         coding-category-iso-else        iso-8859-1
-        coding-category-internal        internal
+        coding-category-emacs-mule      emacs-mule
         coding-category-binary          no-conversion
         coding-category-sjis            sjis
         coding-category-big5            big5
@@ -58,7 +58,7 @@ The default status is as follows.
   (if (local-variable-p 'enable-multibyte-characters)
       (setq enable-multibyte-characters t))
 
-  (setq coding-category-internal        'internal
+  (setq coding-category-emacs-mule      'emacs-mule
         coding-category-iso-7           'iso-2022-7
         coding-category-iso-8-1         'iso-8859-1
         coding-category-iso-8-2         'iso-8859-1
@@ -72,7 +72,7 @@ The default status is as follows.
      coding-category-iso-8-2
      coding-category-iso-8-1
      coding-category-iso-else
-     coding-category-internal 
+     coding-category-emacs-mule 
      coding-category-binary
      coding-category-sjis
      coding-category-big5))
@@ -85,20 +85,14 @@ The default status is as follows.
         rmail-file-coding-system nil)
   )
 
-(defun describe-english-support ()
-  "Describe how Emacs support English."
-  (interactive)
-  (describe-language-support-internal "English"))
-
 (set-language-info-alist
  "English" '((setup-function . setup-english-environment)
-             (describe-function . describe-english-support)
              (tutorial . "TUTORIAL")
              (charset . (ascii))
              (sample-text . "Hello!, Hi!, How are you?")
-             (documentation . "\
+             (documentation . ("\
 There's nothing special you should care to handle English in Emacs.
-You can use English both with enable-multibyte-characters t and nil.")
+You can use English both with enable-multibyte-characters t and nil."))
              ))
 
 (register-input-method "English"
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index f51d99fdeac..fa99bf64a46 100644
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -85,16 +85,10 @@
       (define-key mail-mode-map [C-f5] 'fidel-to-sera-mail)))
   )
 
-(defun describe-ethiopic-support ()
-  "Describe how Emacs supports Ethiopic."
-  (interactive)
-  (describe-language-support-internal "Ethiopic"))
-
 (set-language-info-alist
  "Ethiopic" '((setup-function . setup-ethiopic-environment)
-              (describe-function . describe-ethiopic-support)
               (charset . (ethiopic))
               (sample-text . "$(3$O#U!.(B")
-              (documentation . nil)))
+              (documentation . t)))
 
 ;;; ethiopic.el ends here
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 0dfd30565d7..685c3d5caf0 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -76,25 +76,19 @@ See also the documentation of setup-english-environment."
   (setup-english-environment)
   (setq default-input-method '("European" . "quail-latin-1")))
 
-(defun describe-european-support ()
-  "Describe how Emacs support European languages."
-  (interactive)
-  (describe-language-support-internal "European"))
-
 (set-language-info-alist
  "European" '((setup-function . setup-european-environment)
-              (describe-function . describe-european-support)
               (charset . (ascii latin-iso8859-1 latin-iso8859-2
                           latin-iso8859-3 latin-iso8859-4 latin-iso8859-9))
               (coding-system . (iso-8859-1 iso-8859-2 iso-8859-3
                                 iso-8859-4 iso-8859-9))
               (sample-text
                . "Hello, Hej, Tere, Hei, Bonjour, Gr,A|_(B Gott, Ciao, ,A!(BHola!")
-              (documentation . "\
+              (documentation . ("\
 Almost all of European languages are supported by the character sets and
 coding systems listed below.
 To input them, LEIM (Libraries for Emacs Input Methods) should have been
-installed.")
+installed."))
               ))
 
 (let ((languages '("French" "German" "Spanish" "Italian"
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index 6630e6bdb1d..5ff5a58dbe9 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -52,17 +52,11 @@
   (setq default-input-method '("Greek" . "quail-greek"))
   )
 
-(defun describe-greek-support ()
-  "Describe how Emacs supports Greek."
-  (interactive)
-  (describe-language-support-internal "Greek"))
-
 (set-language-info-alist
  "Greek" '((setup-function . setup-greek-environment)
-           (describe-function. describe-greek-support)
            (charset . (greek-iso8859-7))
            (coding-system . (iso-8859-7))
            (sample-text . "Greek (,FGkk]mija(B)       ,FCei\(B ,Fsar(B")
-           (documentation . nil)))
+           (documentation . t)))
 
 ;;; greek.el ends here
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index 592734620bc..6e8ec265d10 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -54,17 +54,13 @@ But, please note that right-to-left writing is not yet supported."
   (setq default-input-method '("Hebrew" . "quail-hebrew"))
   )
 
-(defun describe-hebrew-support ()
-  "Describe how Emacs supports Hebrew."
-  (interactive)
-  (describe-language-support-internal "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))
             (sample-text . "Hebrew      ,Hylem(B")
-            (documentation . "Right-to-left writing is not yet supported.")))
+            (documentation . ("Right-to-left writing is not yet supported."))
+            ))
 
 ;;; hebew.el ends here
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index d2aa5ab8688..5e40dd28076 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -51,18 +51,13 @@
 
 ;;; Code:
 
-(defun describe-indian-support ()
-  "Describe how Emacs support Indian languages."
-  (interactive)
-  (describe-language-support-internal "Indian"))
-
 (set-language-info-alist
  "Indian" '((describe-function . describe-indian-support)
             (charset . (indian-is13194))
-            (documentation . "\
+            (documentation . ("\
 Among Indian languages, such languages using Devanagari scripts as
 Hindi and Marathi are supproted.  For them, please specify Devanagari
-for more detail.")
+for more detail."))
             ))
 
 ;;  Followings are what you see when you refer to the Emacs
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 490ef7998d9..de9ebe4f454 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -70,7 +70,7 @@
      coding-category-sjis
      coding-category-iso-8-1
      coding-category-iso-else
-     coding-category-internal))
+     coding-category-emacs-mule))
 
   (if (eq system-type 'ms-dos)
       (progn
@@ -88,14 +88,8 @@
         rmail-file-coding-system 'iso-2022-jp)
   )
 
-(defun describe-japanese-support ()
-  "Describe how Emacs supports Japanese."
-  (interactive)
-  (describe-language-support-internal "Japanese"))
-
 (set-language-info-alist
  "Japanese" '((setup-function . setup-japanese-environment)
-              (describe-function . describe-japanese-support)
               (tutorial . "TUTORIAL.jp")
               (charset . (japanese-jisx0208 japanese-jisx0208-1978
                           japanese-jisx0212 latin-jisx0201
@@ -103,6 +97,6 @@
               (coding-system . (euc-japan-1990 sjis
                                 iso-2022-jp iso-2022-jp-1978-irv))
               (sample-text . "Japanese ($BF|K\8l(B)           $B$3$s$K$A$O(B, (I:]FAJ(B")
-              (documentation . nil)))
+              (documentation . t)))
 
 ;;; japanese.el ends here
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index e096db9cb40..ce3cb97d3f3 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -70,18 +70,12 @@
   (setq default-input-method '("Korean" . "quail-hangul"))
   )
 
-(defun describe-korean-support ()
-  "Describe How Emacs supports Korean."
-  (interactive)
-  (describe-language-support-internal "Korean"))
-
 (set-language-info-alist
  "Korean" '((setup-function . setup-korean-environment)
-            (describe-function . describe-korean-support)
             (tutorial . "TUTORIAL.kr")
             (charset . (korean-ksc5601))
             (coding-system . (euc-kr iso-2022-kr))
             (sample-text . "Hangul ($(CGQ1[(B)        $(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B")
-            (documentation . nil)))
+            (documentation . t)))
 
 ;;; korean.el ends here
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index 1bedb6cc91f..4bf542c82dd 100644
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -50,18 +50,12 @@
 
   (setq default-input-method '("Lao" . "quail-lao")))
 
-(defun describe-lao-support ()
-  "Describe how Emacs supports Lao."
-  (interactive)
-  (describe-language-support-internal "Lao"))
-
 (set-language-info-alist
  "Lao" '((setup-function . setup-lao-environment)
-         (describe-function . describe-lao-support)
          (charset . (lao))
          (coding-system . (lao))
          (sample-text . "Lao((1>RJRERG(B)            (1JP:R-04U1(B, 0(1"i1M-`0;Q190$[19ERG(B")
-         (documentation . nil)))
+         (documentation . t)))
 
 (aset use-default-ascent ?(1;(B t)
 (aset use-default-ascent ?(1=(B t)
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 8172d7f59a3..425f68e2206 100644
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -56,18 +56,12 @@
   (setq default-input-method '("Thai" . "quail-thai"))
   )
 
-(defun describe-thai-support ()
-  "Describe how Emacs supports Thai."
-  (interactive)
-  (describe-language-support-internal "Thai"))
-
 (set-language-info-alist
  "Thai" '((tutorial . "TUTORIAL.th")
           (setup-function . setup-thai-environment)
-          (describe-function . describe-thai-support)
           (charset . (thai-tis620))
           (coding-system . (th-tis620))
           (sample-text . "Thai (,T@RIRd7B(B)          ,TJ0GQ1J04U1$0CQ1:(B, ,TJ0GQ1J04U10$h1P(B")
-          (documentation . nil)))
+          (documentation . t)))
 
 ;;; thai.el ends here
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index d8c09f55ce0..e00e13a3599 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -244,18 +244,15 @@ Both tables are indexed by the position code of Vietnamese characters.")
   (setq default-input-method '("Vietnamese" . "quail-viqr"))
   )
 
-(defun describe-vietnamese-support ()
-  "Describe how Emacs supports Vietnamese."
-  (interactive)
-  (describe-language-support-internal "Vietnamese"))
-
 (set-language-info-alist
  "Vietnamese" '((setup-function . setup-vietnamese-environment)
-                (describe-function . describe-vietnamese-support)
                 (charset . (vietnamese-viscii-lower
                             vietnamese-viscii-upper))
                 (coding-system . (viscii vscii viqr))
                 (sample-text . "Vietnamese (Ti,1*(Bng Vi,1.(Bt)     Ch,1`(Bo b,1U(Bn")
-                (documentation . nil)))
+                (documentation . '("\
+For Vietnamese, Emacs uses special charasets internally.
+They can be decoded from and encoded to VISCC, VSCII, and VIQR."))
+                ))
 
 ;;; vietnamese.el ends here