Provide cyril-util nstead of language/cyril-util.

(setup-cyrillic-iso-environment,
setup-cyrillic-koi8-environment,
setup-cyrillic-alternativnyj-environment): Deleted.
(setup-cyrillic-environment): New function.

diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index c76d5f356bc9e1463f184fd9242a30441b42f470..15c386febf0284a366cb2c8598a15a9d6ec7817e 100644 (file)
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -25,35 +25,14 @@
 ;;; Code:
 
 ;;;###autoload
-(defun setup-cyrillic-iso-environment ()
-  "Setup multilingual environment (MULE) for Cyrillic ISO-8859-5 users."
+(defun setup-cyrillic-environment ()
+  "Setup multilingual environment (MULE) for Cyrillic users."
   (interactive)
   (setup-8-bit-environment 'cyrillic-iso8859-5 'cyrillic-iso-8bit
                           '("Cyrillic" . "quail-yawerty"))
   (setq primary-language "Cyrillic"))
 
-;;;###autoload
-(defun setup-cyrillic-koi8-environment ()
-  "Setup multilingual environment for Cyrillic (KOI8-R) users."
-  (interactive)
-  (setup-8-bit-environment 'cyrillic-iso8859-5 'cyrillic-koi8
-                          '("Cyrillic" . "quail-yawerty"))
-
-  (setq primary-language "Cyrillic"))
-
-;;;###autoload
-(defun setup-cyrillic-alternativnyj-environment ()
-  "Setup multilingual environment for Cyrillic (ALTERNATIVNYJ) users."
-  (interactive)
-  (setup-8-bit-environment 'cyrillic-iso8859-5 'cyrillic-alternativnyj
-                          '("Cyrillic" . "quail-yawerty"))
-
-  (setq primary-language "Cyrillic"))
-
 ;;
-(provide 'language/cyril-util)
+(provide 'cyril-util)
 
-;;; Local Variables:
-;;; generated-autoload-file: "../loaddefs.el"
-;;; End:
 ;;; cyril-util.el ends here