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.

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index e7de1e8c5325210d298df997d52b83108c220a91..ab95c4f09c3732f95f2456ad5b3dd02044c7ae96 100644 (file)
--- 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 (\e$AVPND\e(B,\e$AFUM(;0\e(B,\e$A::So\e(B)    \e$ADc:C\e(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 (\e$(0GnM$\e(B,\e$(0N]0*Hd\e(B) \e$(0*/=(\e(B, \e$(0+$)p\e(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 3646521e003e4b3c1838eec1c6bc9aa186801bec..737fefb39e98082b07088d30012cc3dd61a465c3 100644 (file)
--- 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 (\e,L@caaZXY\e(B)   \e,L7T`PRabRcYbU\e(B!")
-             (documentation . nil)))
+             (documentation . t)))
 
 ;;; cyrillic.el ends here

diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index 9fd47c5760736ac0075e1eed96497ed074971012..ada8a8f4821513943d45cea8b260ffa600717492 100644 (file)
--- 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 8e5d3c8d64e8b8026dc224d49b755b8225be9062..76d08f47297701a4623684466aec2a5eb13d597b 100644 (file)
--- 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 f51d99fdeac046a7534cc140b3befaf76af53795..fa99bf64a46ca8c0ed3c121548ed3102a1182787 100644 (file)
--- 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 . "\e$(3$O#U!.\e(B")
-             (documentation . nil)))
+             (documentation . t)))
 
 ;;; ethiopic.el ends here

diff --git a/lisp/language/european.el b/lisp/language/european.el
index 0dfd30565d75bed5138144ae960ca9daa75937bb..685c3d5caf0dd173f939d12c6609a6a1c2342282 100644 (file)
--- 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\e,A|_\e(B Gott, Ciao, \e,A!\e(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 6630e6bdb1da047cc251585439f5b6a865dabb38..5ff5a58dbe90b1067935e818b881e95a265c9be9 100644 (file)
--- 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 (\e,FGkk]mija\e(B)       \e,FCei\\e(B \e,Fsar\e(B")
-          (documentation . nil)))
+          (documentation . t)))
 
 ;;; greek.el ends here

diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index 592734620bc988b2932f6dadcea146aa23bc3087..6e8ec265d1000aaab43096c6b7bc51bf4fd0aa7c 100644 (file)
--- 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      \e,Hylem\e(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 d2aa5ab8688f5480290e950567fefbf3b3c20166..5e40dd28076a6246ea51e69ca5302a327649ed4e 100644 (file)
--- 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 490ef7998d98b3978a52c5c018c5376586e677dd..de9ebe4f4541ca7e1c65edd518769314f21329d2 100644 (file)
--- 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 (\e$BF|K\8l\e(B)           \e$B$3$s$K$A$O\e(B, \e(I:]FAJ\e(B")
-             (documentation . nil)))
+             (documentation . t)))
 
 ;;; japanese.el ends here

diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index e096db9cb40972497f49454efcee28cc374decb7..ce3cb97d3f32d6442ad2a14980a94d0666efefbf 100644 (file)
--- 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 (\e$(CGQ1[\e(B)        \e$(C>H3gGO<<?d\e(B, \e$(C>H3gGO=J4O1n\e(B")
-           (documentation . nil)))
+           (documentation . t)))
 
 ;;; korean.el ends here

diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index 1bedb6cc91f6c446e0d1f3f992125537e049d373..4bf542c82dd67b879a7dc5e3a4fb3aecb770d331 100644 (file)
--- 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(\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 . nil)))
+        (documentation . t)))
 
 (aset use-default-ascent ?\e(1;\e(B t)
 (aset use-default-ascent ?\e(1=\e(B t)

diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 8172d7f59a357ba2634d4e3a61364da40b787355..425f68e220629a996215996948911a62f66e4e5f 100644 (file)
--- 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 (\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")
-         (documentation . nil)))
+         (documentation . t)))
 
 ;;; thai.el ends here

diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index d8c09f55ce0dcad81530e6044ef56d2a5a7a0af3..e00e13a35996f752cb57c59a4f4512f563a5c5af 100644 (file)
--- 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\e,1*\e(Bng Vi\e,1.\e(Bt)     Ch\e,1`\e(Bo b\e,1U\e(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