(setup-XXX-environment): Just call set-language-environment. If

they used to do some other jobs than what done by
set-language-environment, those jobs are done in
setup-XXX-environment-internal now.

10 files changed, 25 insertions, 37 deletions

diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index 8cdf3901225..a4a2569a3d0 100644
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -28,25 +28,19 @@
 (defun setup-chinese-gb-environment ()
   "Setup multilingual environment (MULE) for Chinese GB2312 users."
   (interactive)
-  (setup-english-environment)
-  (set-language-environment-coding-systems "Chinese-GB")
-  (setq default-input-method  "chinese-py-punct"))
+  (set-language-environment "Chinese-GB"))
 
 ;;;###autoload
 (defun setup-chinese-big5-environment ()
   "Setup multilingual environment (MULE) for Chinese Big5 users."
   (interactive)
-  (setup-english-environment)
-  (set-language-environment-coding-systems "Chinese-BIG5")
-  (setq default-input-method "chinese-py-punct-b5"))
+  (set-language-environment "Chinese-BIG5"))
 
 ;;;###autoload
 (defun setup-chinese-cns-environment ()
   "Setup multilingual environment (MULE) for Chinese CNS11643 family users."
   (interactive)
-  (setup-english-environment)
-  (set-language-environment-coding-systems "Chinese-CNS")
-  (setq default-input-method "chinese-cns-quick"))
+  (set-language-environment "Chinese-CNS"))
 
 ;; Hz/ZW encoding stuffs
 
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index 8aa51a04c51..4df69bcefee 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -27,23 +27,19 @@
 (defun setup-cyrillic-iso-environment ()
   "Setup multilingual environment (MULE) for Cyrillic ISO-8859-5 users."
   (interactive)
-  (setup-8-bit-environment "Cyrillic-ISO" 'cyrillic-iso8859-5
-                           "cyrillic-yawerty"))
+  (set-language-environment "Cyrillic-ISO"))
 
 ;;;###autoload
 (defun setup-cyrillic-koi8-environment ()
   "Setup multilingual environment (MULE) for Cyrillic KOI8 users."
   (interactive)
-  (setup-8-bit-environment "Cyrillic-KOI8" 'cyrillic-iso8859-5
-                           "cyrillic-yawerty"))
+  (set-language-environment "Cyrillic-KOI8"))
 
 ;;;###autoload
 (defun setup-cyrillic-alternativnyj-environment ()
   "Setup multilingual environment (MULE) for Cyrillic ALTERNATIVNYJ users."
   (interactive)
-  (setup-8-bit-environment "Cyrillic-ALT" 'cyrillic-iso8859-5
-                           "cyrillic-yawerty")
-  (setq coding-category-raw-text 'cyrillic-alternativnyj))
+  (set-language-environment "Cyrillic-ALT"))
 
 ;;;###autoload
 (defun cyrillic-encode-koi8-r-char (char)
diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el
index cd5a978e881..ce2d564b163 100644
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -44,8 +44,8 @@
 (defun setup-devanagari-environment ()
   "Setup multilingual environment (MULE) for languages using Devanagari."
   (interactive)
-  (setup-8-bit-environment "Devanagari" nil "devanagari-itrans"))
-
+  (set-language-environment "Devanagari"))
+           
 ;;; Basic functions.
 
 ;;;###autoload
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index ff5c54aa090..37dc4c40a6c 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -32,10 +32,10 @@
 ;;;###autoload
 (defun setup-ethiopic-environment ()
   "Setup multilingual environment for Ethiopic."
-  (interactive)
-  (setup-english-environment)
-  (setq default-input-method "ethiopic")
+  (set-language-environment "Ethiopic"))
 
+;;;###autoload
+(defun setup-ethiopic-environment-internal ()
   (let ((key-bindings '((" " . ethio-insert-space)
                         ([?\S- ] . ethio-insert-ethio-space)
                         ([?\C-'] . ethio-gemination)
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index bdc33addd1c..6cd54e27114 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -30,12 +30,13 @@
 (defun setup-japanese-environment ()
   "Setup multilingual environment (MULE) for Japanese."
   (interactive)
-  (setup-english-environment)
-  (set-language-environment-coding-systems "Japanese")
+  (set-language-environment "Japanese"))
+
+;;;###autoload
+(defun setup-japanese-environment-internal ()
   (if (eq system-type 'ms-dos)
-      (prefer-coding-system 'japanese-shift-jis))
-  (setq default-file-name-coding-system 'japanese-iso-8bit)
-  (setq default-input-method "japanese")
+      (prefer-coding-system 'japanese-shift-jis)
+    (setq default-file-name-coding-system 'japanese-iso-8bit))
   (setq sentence-end-save sentence-end)
   (setq sentence-end (concat sentence-end "\\|[$B!#!)!*(B]")))
 
diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index c1787a15a3b..8afdbbfa822 100644
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -90,11 +90,10 @@
 (defun setup-korean-environment ()
   "Setup multilingual environment (MULE) for Korean."
   (interactive)
-  (setup-english-environment)
-  (set-language-environment-coding-systems "Korean")
-
-  (setq default-input-method "korean-hangul")
+  (set-language-environment "Korean"))
 
+;;;###autoload
+(defun setup-korean-environment-internal ()
   (let ((key-bindings korean-key-bindings))
     (while key-bindings
       (let* ((this (car key-bindings))
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 4cada8f710d..cb78b7fc067 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" 'lao "lao"))
+  (set-language-environment "Lao"))
 
 (let ((l '((?(1!(B consonant "LETTER KOR  KAI'" "CHICKEN")
            (?(1"(B consonant "LETTER KHOR KHAI'" "EGG")
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index 645bf03df0f..3d4863313ec 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" 'thai-tis620 "thai-kesmanee"))
+  (set-language-environment "Thai"))
 
 ;; Setting information of Thai characters.
 
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index bb10564c699..6a940212c52 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -35,9 +35,7 @@
 ;;;###autoload
 (defun setup-tibetan-environment ()
   (interactive)
-  (setup-english-environment)
-  (set-language-environment-coding-systems "Tibetan")
-  (setq default-input-method  "tibetan-wylie"))
+  (set-language-environment "Tibetan"))
 
 ;;; This function makes a transcription string for
 ;;; re-composing a character.
@@ -106,7 +104,7 @@
 ;;;
 ;;; Here are examples of the words "bsgrubs" and "h'uM"
 ;;;
-;;;            $(7"72%q`"U1"7"G(B         2$(7"H`#A`"U0"_1(B        
+;;;            $(7"7(B2$(7%q`"U(B1$(7"7"G(B         2$(7"H`#A`"U0"_(B1        
 ;;;
 ;;;                             M
 ;;;             b s b s         h
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index 5e3ce7e9cf6..0520a836ed2 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -45,7 +45,7 @@
 (defun setup-vietnamese-environment ()
   "Setup multilingual environment (MULE) for Vietnamese VISCII users."
   (interactive)
-  (setup-8-bit-environment "Vietnamese" nil "vietnamese-viqr"))
+  (set-language-environment "Vietnamese"))
 
 ;; VIQR is a menmonic encoding specification for Vietnamese.
 ;; It represents diacritical marks by ASCII characters as follows: