("LANUGAGE-ENVIRONMENT"): Delete property setup-function or change

the value to setup-XXX-environment-internal.  Add properties
nonascii-translation, input-method, features, unibyte-syntax, and
unibyte-display.

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index 47e43ff2e87902b66666c97432c95e96f456acaf..cdce121e33821fc7a0b277aaf9a8f7294e17fccd 100644 (file)
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -112,10 +112,11 @@
     nil))
 
 (set-language-info-alist
- "Chinese-GB" '((setup-function . setup-chinese-gb-environment)
-               (charset chinese-gb2312 chinese-sisheng)
+ "Chinese-GB" '((charset chinese-gb2312 chinese-sisheng)
                (coding-system chinese-iso-8bit iso-2022-cn chinese-hz)
                (coding-priority chinese-iso-8bit chinese-big5 iso-2022-cn)
+               (input-method . "chinese-py-punct")
+               (features china-util)
                (sample-text . "Chinese (\e$AVPND\e(B,\e$AFUM(;0\e(B,\e$A::So\e(B)    \e$ADc:C\e(B")
                (documentation . "Support for Chinese GB2312 character set."))
  '("Chinese"))
@@ -152,10 +153,11 @@
       (cons (cons "big5" ccl-encode-big5-font) font-ccl-encoder-alist))
 
 (set-language-info-alist
- "Chinese-BIG5" '((setup-function . setup-chinese-big5-environment)
-                 (charset chinese-big5-1 chinese-big5-2)
+ "Chinese-BIG5" '((charset chinese-big5-1 chinese-big5-2)
                  (coding-system chinese-big5 chinese-iso-7bit)
                  (coding-priority chinese-big5 iso-2022-cn chinese-iso-8bit)
+                 (input-method . "chinese-py-punct-b5")
+                 (features china-util)
                  (sample-text . "Cantonese (\e$(0GnM$\e(B,\e$(0N]0*Hd\e(B) \e$(0*/=(\e(B, \e$(0+$)p\e(B")
                  (documentation . "Support for Chinese Big5 character set."))
  '("Chinese"))
@@ -165,13 +167,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (set-language-info-alist
- "Chinese-CNS" '((setup-function . setup-chinese-cns-environment)
-                (charset chinese-cns11643-1 chinese-cns11643-2
+ "Chinese-CNS" '((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)
                 (coding-priority iso-2022-cn chinese-big5 chinese-iso-8bit)
+                (features china-util)
+                (input-method . "chinese-cns-quick")
                 (documentation . "Support for Chinese CNS character sets."))
  '("Chinese"))
 

diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 22cf312d64c4a2b05eedfd47331760c9caa7d7a2..cbc41f6b256e3f6a0b4a2a74aaf632d14b9a7cc6 100644 (file)
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -44,10 +44,13 @@
 (define-coding-system-alias 'iso-8859-5 'cyrillic-iso-8bit)
 
 (set-language-info-alist
- "Cyrillic-ISO" '((setup-function . setup-cyrillic-iso-environment)
-                 (charset cyrillic-iso8859-5)
+ "Cyrillic-ISO" '((charset cyrillic-iso8859-5)
                  (coding-system cyrillic-iso-8bit)
                  (coding-priority cyrillic-iso-8bit)
+                 (input-method . "cyrillic-yawerty")
+                 (nonascii-translation . cyrillic-iso8859-5)
+                 (unibyte-display . cyrillic-iso-8bit)
+                 (features cyril-util)
                  (sample-text . "Russian (\e,L@caaZXY\e(B)       \e,L7T`PRabRcYbU\e(B!")
                  (documentation . "Support for Cyrillic ISO-8859-5."))
  '("Cyrillic"))
@@ -138,14 +141,16 @@
   "Value of `nonascii-translation-table' in Cyrillic-KOI8 language environment..")
 
 (set-language-info-alist
- "Cyrillic-KOI8" `((setup-function . setup-cyrillic-koi8-environment)
-                  (charset cyrillic-iso8859-5)
-                  (nonascii-translation-table
+ "Cyrillic-KOI8" `((charset cyrillic-iso8859-5)
+                  (nonascii-translation
                    . ,cyrillic-koi8-r-nonascii-translation-table)
                   (charset-origin-alist
                    (cyrillic-iso8859-5 "KOI8-R" cyrillic-encode-koi8-r-char))
                   (coding-system cyrillic-koi8)
                   (coding-priority cyrillic-koi8)
+                  (input-method . "cyrillic-yawerty")
+                  (features cyril-util)
+                  (unibyte-display . cyrillic-koi8)
                   (sample-text . "Russian (\e,L@caaZXY\e(B)      \e,L7T`PRabRcYbU\e(B!")
                   (documentation . "Support for Cyrillic KOI8-R."))
  '("Cyrillic"))
@@ -232,15 +237,17 @@
   "Value of `nonascii-translation-table' in Cyrillic-ALT language environment.")
 
 (set-language-info-alist
- "Cyrillic-ALT" '((setup-function . setup-cyrillic-alternativnyj-environment)
-                 (charset cyrillic-iso8859-5)
-                 (nonascii-translation-table
-                  . cyrillic-alternativnyj-nonascii-translation-table)
+ "Cyrillic-ALT" `((charset cyrillic-iso8859-5)
+                 (nonascii-translation
+                  . ,cyrillic-alternativnyj-nonascii-translation-table)
                  (charset-origin-alist
                   (cyrillic-iso8859-5 "ALTERNATIVNYJ"
-                                      cyrillic-encode-koi8-char))
+                                      cyrillic-encode-koi8-r-char))
                  (coding-system cyrillic-alternativnyj)
                  (coding-priority cyrillic-alternativnyj)
+                 (input-method . "cyrillic-yawerty")
+                 (features cyril-util)
+                 (unibyte-display . cyrillic-alternativnyj)
                  (sample-text . "Russian (\e,L@caaZXY\e(B)       \e,L7T`PRabRcYbU\e(B!")
                  (documentation . "Support for Cyrillic ALTERNATIVNYJ."))
  '("Cyrillic"))

diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index 740be8b3d7c3d7559a0575b36ba66d4d64b33bd1..6a86957ccb04fd0477a88397479d6fba46b2a44a 100644 (file)
--- a/lisp/language/devanagari.el
+++ b/lisp/language/devanagari.el
@@ -42,10 +42,11 @@
 (define-coding-system-alias 'devanagari 'in-is13194-devanagari)
 
 (set-language-info-alist
- "Devanagari" '((setup-function . setup-devanagari-environment)
-               (charset indian-is13194 indian-2-column indian-1-column)
+ "Devanagari" '((charset indian-is13194 indian-2-column indian-1-column)
                (coding-system in-is13194-devanagari)
                (coding-priority in-is13194-devanagari)
+               (input-method . "devanagari-itrans")
+               (features devan-util)
                (documentation . "\
 Such languages using Devanagari script as Hindi and Marathi
 are supported in this language environment."))

diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 3e212e0d83c37b2ecaa256a20444c61ec90f27b6..1f348bc504639a7dd2ef7b99d7151ffe5f6ac9fc 100644 (file)
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -49,11 +49,13 @@
       (cons (cons "ethiopic" ccl-encode-ethio-font) font-ccl-encoder-alist))
 
 (set-language-info-alist
- "Ethiopic" '((setup-function . setup-ethiopic-environment)
+ "Ethiopic" '((setup-function . setup-ethiopic-environment-internal)
              (exit-function . exit-ethiopic-environment)
              (charset ethiopic)
              (coding-system iso-2022-7bit)
              (coding-priority iso-2022-7bit)
+             (input-method . "ethiopic")
+             (features ethio-util)
              (sample-text . "\e$(3$Q#U!.\e(B")
              (documentation . t)))
 

diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 6e35b86ab753253b2004d98cc120638192052e35..36454674c936b0f932c03c037526bb0c250eff8c 100644 (file)
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -77,7 +77,7 @@
 (define-coding-system-alias 'euc-jp 'japanese-iso-8bit)
 
 (set-language-info-alist
- "Japanese" '((setup-function . setup-japanese-environment)
+ "Japanese" '((setup-function . setup-japanese-environment-internal)
              (exit-function . exit-japanese-environment)
              (tutorial . "TUTORIAL.ja")
              (charset japanese-jisx0208 japanese-jisx0208-1978
@@ -86,6 +86,8 @@
                             japanese-shift-jis japanese-iso-7bit-1978-irv)
              (coding-priority iso-2022-jp japanese-iso-8bit
                               japanese-shift-jis)
+             (input-method . "japanese")
+             (features japan-util)
              (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)))
 

diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index 8d3aed4f055763e43523d3f18ba312f655edb6f0..e1829a23cb314fbe79876c2a788411f65d6c8177 100644 (file)
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -56,6 +56,8 @@
            (tutorial . "TUTORIAL.ko")
            (charset korean-ksc5601)
            (coding-system iso-2022-kr korean-iso-8bit)
+           (input-method . "korean-hangul")
+           (features korea-util)
            (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 . "\

diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index 175ced0f817224518eb611488a22f30ce4746cab..c53cd14a81461fabef96b492fe6aa59a3998fef1 100644 (file)
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -32,11 +32,13 @@
  '((safe-charsets ascii lao)))
 
 (set-language-info-alist
- "Lao" '((setup-function . setup-lao-environment)
-        (charset lao)
+ "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")
+        (input-method . "lao")
+        (nonascii-translation . lao)
+        (unibyte-display . lao)
+        (features lao-util)
         (documentation . t)))
 
 (aset use-default-ascent ?\e(1;\e(B t)

diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 6ee6d8780bf1714ad020d9083e444319cae5f7d3..3b88e892b7fd3b643b7867023769e0052906ce19 100644 (file)
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -42,10 +42,13 @@
 
 (set-language-info-alist
  "Thai" '((tutorial . "TUTORIAL.th")
-         (setup-function . setup-thai-environment)
          (charset thai-tis620)
          (coding-system thai-tis620)
          (coding-priority thai-tis620)
+         (nonascii-translation . thai-tis620)
+         (input-method . "thai-kesmanee")
+         (unibyte-display . thai-tis620)
+         (features thai-util)
          (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)))
 

diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 5aded387bde8469265c992c84b9e53311796b1a8..4041296ef5c657f5973134116ff54a92e43c2829 100644 (file)
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -100,13 +100,14 @@
 (define-coding-system-alias 'tibetan 'tibetan-iso-8bit)
 
 (set-language-info-alist
- "Tibetan" '((setup-function . setup-tibetan-environment)
-            (charset tibetan tibetan-1-column)
+ "Tibetan" '((charset tibetan tibetan-1-column)
             (coding-system tibetan-iso-8bit)
             (coding-priority iso-2022-7bit tibetan-iso-8bit)
+            (input-method . "tibetan-wylie")
+            (features tibet-util)
             (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")))
+"Tibetan (\e2\e$(7"70"]\e(B\e1\e$(7"2\e$(8!;\e(B\e2\e$(7%P`"Q\e(B\e1\e$(7"2\e$(8!;\e(B) \e2\e$(7#RP#SP#S\e(B\e1\e$(7!>"7\e(B\e2\e$(7$P`"Q\e(B\e1\e$(8!;\e(B\e2\e$(7"E0"S\e(B\e1\e$(7"G\e$(8!;\e$(7"7\e(B\e2\e$(7"20"[\e(B\e1\e$(8!;\e(B\e2\e$(7"D0"[\e(B\e1\e$(7"#"G!>\e(B\e2\e$(7"I0"]0"_\e(B\e1\e$(8!;\e(B\e2\e$(7"9`"Q\e(B\e1\e$(8!;\e(B\e2\e$(7"/0"S\e(B\e1\e$(8!;\e(B\e2\e$(7"5`"Q\e(B\e1\e2\e$(7#2`#90"[\e(B\e1\e$(8!;\e(B\e2\e$(7"H`#A`"U0"c\e(B\e1\e$(7!>\e(B")))
 
 
 ;;;
@@ -497,11 +498,11 @@
     ("\e$(7"`\e(B" . "\e$(8"`\e(B")
     ("\e$(7!;\e(B" . "\e$(8!;\e(B")
     ("\e$(7!D\e(B" . "\e$(8!D\e(B")
-    ("\e$(7!>\e(B \e$(7!>\e(B" . "\e2\e$(7!>P\e(B P\e$(7!>\e1\e(B")                      ; Yes this is dirty. But ...
-    ("\e$(7!4!5!5\e(B" . "\e2\e$(7#RP#SP#SP#S\e1\e(B")
-    ("\e$(7!4!5\e(B" . "\e2\e$(7#RP#SP#S\e1\e(B")
-    ("\e$(7!6\e(B" . "\e2\e$(7#RP#S_!I\e1\e(B")
-    ("\e$(7!4\e(B"   . "\e2\e$(7#RP#S\e1\e(B")))
+    ("\e$(7!>\e(B \e$(7!>\e(B" . "\e2\e$(7!>P\e(B P\e$(7!>\e(B\e1")                      ; Yes this is dirty. But ...
+    ("\e$(7!4!5!5\e(B" . "\e2\e$(7#RP#SP#SP#S\e(B\e1")
+    ("\e$(7!4!5\e(B" . "\e2\e$(7#RP#SP#S\e(B\e1")
+    ("\e$(7!6\e(B" . "\e2\e$(7#RP#S_!I\e(B\e1")
+    ("\e$(7!4\e(B"   . "\e2\e$(7#RP#S\e(B\e1")))
 
 (defvar tibetan-regexp
   (let ((l (append tibetan-consonant-transcription-alist

diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index c27f9b17afc3f75d7805b9d4977985ea28110a3f..9714a1523bf4ca1dd4d145618b7b9bddeb21f615 100644 (file)
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -240,9 +240,8 @@ Both tables are indexed by the position code of Vietnamese characters.")
   "Value of `nonascii-translation-table' in Vietnamese language environment.")
 
 (set-language-info-alist
- "Vietnamese" `((setup-function . setup-vietnamese-environment)
-               (charset vietnamese-viscii-lower vietnamese-viscii-upper)
-               (nonascii-translation-table
+ "Vietnamese" `((charset vietnamese-viscii-lower vietnamese-viscii-upper)
+               (nonascii-translation
                 . ,viet-viscii-nonascii-translation-table)
                (charset-origin-alist
                 (vietnamese-viscii-lower "VISCII" viet-encode-viscii-char)
@@ -250,6 +249,9 @@ Both tables are indexed by the position code of Vietnamese characters.")
                (coding-system vietnamese-viscii vietnamese-vscii
                               vietnamese-viqr)
                (coding-priority vietnamese-viscii)
+               (input-method . "vietnamese-viqr")
+               (unibyte-display . vietnamese-viscii)
+               (features viet-util)
                (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.