6 files changed, 34 insertions, 23 deletions

diff --git a/lisp/language/czech.el b/lisp/language/czech.el
index 69de792330f..b905cef4cea 100644
--- a/lisp/language/czech.el
+++ b/lisp/language/czech.el
@@ -31,14 +31,16 @@
 (defun setup-czech-environment ()
   "Setup multilingual environment (MULE) for Czech."
   (interactive)
-  (funcall (get-language-info "Latin-2" 'setup-function))
-  (setq default-input-method "czech"))
+  (set-language-environment "Latin-2"))
 
 (set-language-info-alist
- "Czech" '((setup-function . setup-czech-environment)
-	   (charset . (ascii latin-iso8859-2))
+ "Czech" '((charset . (ascii latin-iso8859-2))
 	   (coding-system . (iso-8859-2))
 	   (coding-priority . (iso-8859-2))
+	   (input-method . "czech")
+	   (nonascii-translation . latin-iso8859-2)
+	   (unibyte-syntax . "latin-2")
+	   (unibyte-display . iso-8859-2)
 	   (tutorial . "TUTORIAL.cs")
 	   (sample-text . "P,Bx(Bejeme v,Ba(Bm hezk,B}(B den!")
 	   (documentation . t))
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index 85bfd380839..96a0ec6aafd 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -41,14 +41,15 @@
 (defun setup-greek-environment ()
   "Setup multilingual environment (MULE) for Greek."
   (interactive)
-  (setup-8-bit-environment "Greek" 'greek-iso8859-7 "greek-postfix"))
+  (set-language-environment "Greek"))
 
 (set-language-info-alist
- "Greek" '((setup-function . setup-greek-environment)
-	   (charset . (greek-iso8859-7))
+ "Greek" '((charset . (greek-iso8859-7))
 	   (coding-system . (greek-iso-8bit))
 	   (coding-priority greek-iso-8bit)
-	   (sample-text . "Greek (,FGkk]mija(B)	,FCei\(B ,Fsar(B")
+	   (nonascii-translation . greek-iso8859-7)
+	   (input-method . "greek")
+	   (unibyte-display . greek-iso-8bit)
 	   (documentation . t)))
 
 ;;; greek.el ends here
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index 14b8ff54286..f754108ae75 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -42,14 +42,16 @@
   "Setup multilingual environment (MULE) for Hebrew.
 But, please note that right-to-left writing is not yet supported."
   (interactive)
-  (setup-8-bit-environment "Hebrew" 'hebrew-iso8859-8 "hebrew"))
+  (set-language-environment "Hebrew"))
 
 (set-language-info-alist
- "Hebrew" '((setup-function . setup-hebrew-environment)
-	    (describe-function . describe-hebrew-support)
+ "Hebrew" '((describe-function . describe-hebrew-support)
 	    (charset . (hebrew-iso8859-8))
 	    (coding-priority hebrew-iso-8bit)
 	    (coding-system . (hebrew-iso-8bit))
+	    (nonascii-translation . hebrew-iso8859-8)
+	    (input-method . "hebrew")
+	    (unibyte-display . hebrew-iso-8bit)
 	    (sample-text . "Hebrew	,Hylem(B")
 	    (documentation . "Right-to-left writing is not yet supported.")
 	    ))
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index 53b1399bbab..9fe1580a4a8 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -29,13 +29,15 @@
 (defun setup-ipa-environment ()
   "Setup multilingual environment (MULE) for IPA."
   (interactive)
-  (setup-english-environment))
+  (set-language-environment "IPA"))
 
 (set-language-info-alist
- "IPA" '((setup-function . setup-ipa-environment)
-	 (charset . (ipa))
+ "IPA" '((charset . (ipa))
 	 (coding-priority iso-2022-7bit)
 	 (coding-system iso-2022-7bit)
+	 (input-method . "ipa")
+	 (nonascii-translation . ipa)
+	 (unibyte-display . iso-2022-7bit)
 	 (documentation . "\
 IPA is International Phonetic Alphabet for English, French, German
 and Italian.")))
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index 595f0cea7e4..939643ae985 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -31,15 +31,17 @@
 (defun setup-romanian-environment ()
   "Setup multilingual environment (MULE) for Romanian."
   (interactive)
-  (setup-8-bit-environment "Romanian" 'latin-iso8859-2 "latin-2-postfix")
-  (load "latin-2"))
+  (set-language-environment "Romanian"))
 
 (set-language-info-alist
- "Romanian" '((setup-function . setup-romanian-environment)
-	      (charset . (ascii latin-iso8859-2))
+ "Romanian" '((charset . (ascii latin-iso8859-2))
 	      (coding-system . (iso-8859-2))
 	      (coding-priority . (iso-8859-2))
-	      (sample-text . "Bun-Aă-B ziua, bine a-Ați-B venit!")
+	      (nonascii-translation . latin-iso8859-2)
+	      (input-method . "latin-2-postfix")
+	      (unibyte-syntax . "latin-2")
+	      (unibyte-display . iso-8859-2)
+	      (sample-text . "Bună ziua, bine ați venit!")
 	      (documentation . t))
  '("European"))
 
diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el
index b944ed80ffc..d9aaf3470d5 100644
--- a/lisp/language/slovak.el
+++ b/lisp/language/slovak.el
@@ -33,14 +33,16 @@
 (defun setup-slovak-environment ()
   "Setup multilingual environment (MULE) for Slovak."
   (interactive)
-  (funcall (get-language-info "Latin-2" 'setup-function))
-  (setq default-input-method "slovak"))
+  (set-language-environment "Slovak"))
 
 (set-language-info-alist
- "Slovak" '((setup-function . setup-slovak-environment)
-	    (charset . (ascii latin-iso8859-2))
+ "Slovak" '((charset . (ascii latin-iso8859-2))
 	    (coding-system . (iso-8859-2))
 	    (coding-priority . (iso-8859-2))
+	    (nonascii-translation . latin-iso8859-2)
+	    (input-method . "slovak")
+	    (unibyte-syntax . "latin-2")
+	    (unibyte-display . iso-8859-2)
 	    (sample-text . "Prajeme V,Ba(Bm pr,Bm(Bjemn,B}(B de,Br(B!")
 	    (documentation . t))
  '("European"))