("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.

10 files changed, 60 insertions, 35 deletions

diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index 47e43ff2e87..cdce121e338 100644
--- 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 ($AVPND(B,$AFUM(;0(B,$A::So(B)	$ADc:C(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 ($(0GnM$(B,$(0N]0*Hd(B)	$(0*/=((B, $(0+$)p(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 22cf312d64c..cbc41f6b256 100644
--- 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 (,L@caaZXY(B)	,L7T`PRabRcYbU(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 (,L@caaZXY(B)	,L7T`PRabRcYbU(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 (,L@caaZXY(B)	,L7T`PRabRcYbU(B!")
 		  (documentation . "Support for Cyrillic ALTERNATIVNYJ."))
  '("Cyrillic"))
diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index 740be8b3d7c..6a86957ccb0 100644
--- 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 3e212e0d83c..1f348bc5046 100644
--- 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 . "$(3$Q#U!.(B")
 	      (documentation . t)))
 
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 6e35b86ab75..36454674c93 100644
--- 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 ($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 8d3aed4f055..e1829a23cb3 100644
--- 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 ($(CGQ1[(B)	$(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B")
 	    (documentation . "\
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index 175ced0f817..c53cd14a814 100644
--- 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((1>RJRERG(B)            (1JP:R-04U1(B, 0(1"i1M-`0;Q190$[19ERG(B")
+	 (input-method . "lao")
+	 (nonascii-translation . lao)
+	 (unibyte-display . lao)
+	 (features lao-util)
 	 (documentation . t)))
 
 (aset use-default-ascent ?(1;(B t)
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 6ee6d8780bf..3b88e892b7f 100644
--- 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 (,T@RIRd7B(B)		,TJ(B0,TGQ(B1,TJ(B0,T4U(B1,T$(B0,TCQ(B1,T:(B, ,TJ(B0,TGQ(B1,TJ(B0,T4U(B10,T$h(B1,TP(B")
 	  (documentation . t)))
 
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 5aded387bde..4041296ef5c 100644
--- 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 (2$(7"70"]1"2$(8!;2$(7%P`"Q1"2$(8!;(B) 2$(7#RP#SP#S1!>"72$P`"Q1$(8!;2$(7"E0"S1"G$(8!;$(7"72"20"[1$(8!;2$(7"D0"[1"#"G!>2"I0"]0"_1$(8!;2$(7"9`"Q1$(8!;2$(7"/0"S1$(8!;2$(7"5`"Q12#2`#90"[1$(8!;2$(7"H`#A`"U0"c1!>(B")))
+"Tibetan (2$(7"70"](B1$(7"2$(8!;(B2$(7%P`"Q(B1$(7"2$(8!;(B) 2$(7#RP#SP#S(B1$(7!>"7(B2$(7$P`"Q(B1$(8!;(B2$(7"E0"S(B1$(7"G$(8!;$(7"7(B2$(7"20"[(B1$(8!;(B2$(7"D0"[(B1$(7"#"G!>(B2$(7"I0"]0"_(B1$(8!;(B2$(7"9`"Q(B1$(8!;(B2$(7"/0"S(B1$(8!;(B2$(7"5`"Q(B12$(7#2`#90"[(B1$(8!;(B2$(7"H`#A`"U0"c(B1$(7!>(B")))
 
 
 ;;;
@@ -497,11 +498,11 @@
     ("$(7"`(B" . "$(8"`(B")
     ("$(7!;(B" . "$(8!;(B")
     ("$(7!D(B" . "$(8!D(B")
-    ("$(7!>(B $(7!>(B" . "2$(7!>P(B P$(7!>1(B")			; Yes this is dirty. But ...
-    ("$(7!4!5!5(B" . "2$(7#RP#SP#SP#S1(B")
-    ("$(7!4!5(B" . "2$(7#RP#SP#S1(B")
-    ("$(7!6(B" . "2$(7#RP#S_!I1(B")
-    ("$(7!4(B"   . "2$(7#RP#S1(B")))
+    ("$(7!>(B $(7!>(B" . "2$(7!>P(B P$(7!>(B1")			; Yes this is dirty. But ...
+    ("$(7!4!5!5(B" . "2$(7#RP#SP#SP#S(B1")
+    ("$(7!4!5(B" . "2$(7#RP#SP#S(B1")
+    ("$(7!6(B" . "2$(7#RP#S_!I(B1")
+    ("$(7!4(B"   . "2$(7#RP#S(B1")))
 
 (defvar tibetan-regexp
   (let ((l (append tibetan-consonant-transcription-alist
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index c27f9b17afc..9714a1523bf 100644
--- 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,1*(Bng Vi,1.(Bt)	Ch,1`(Bo b,1U(Bn")
 		(documentation . "\
 For Vietnamese, Emacs uses special charasets internally.