("Cyrillic-KOI8"): Fix input-method.

("Russian"): New.
("Bulgarian"): Add tutorial.

diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index b4135c68bfbfffee92bc903bf46846c55a45420e..742da4fc5a0bf257cdb9afb9a124ec49d2493f42 100644 (file)
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
 
 ;; Author: Kenichi Handa <handa@etl.go.jp>
 ;; Keywords: multilingual, Cyrillic, i18n
@@ -216,13 +216,29 @@ This works whether or not the table is Unicode-based or
                            'translation-table))
                   (coding-system cyrillic-koi8)
                   (coding-priority cyrillic-koi8 cyrillic-iso-8bit)
-                  (input-method . "cyrillic-jcuken")
+                  (input-method . "russian-typewriter")
                   (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"))
 
+(set-language-info-alist
+ "Russian" `((charset cyrillic-iso8859-5)
+            (nonascii-translation
+             . ,(get 'cyrillic-koi8-r-nonascii-translation-table
+                     'translation-table))
+            (coding-system cyrillic-koi8)
+            (coding-priority cyrillic-koi8 cyrillic-iso-8bit)
+            (input-method . "russian-computer")
+            (features cyril-util)
+            (unibyte-display . cyrillic-koi8)
+            (sample-text . "Russian (\e,L@caaZXY\e(B)    \e,L7T`PRabRcYbU\e(B!")
+            (documentation . "\
+Support for Russian using koi8-r and the russian-computer input method.")
+            (tutorial . "TUTORIAL.ru"))
+ '("Cyrillic"))
+
 
 (defvar cyrillic-koi8-u-decode-table
   [
@@ -436,12 +452,12 @@ This works whether or not the table is Unicode-based or
 
 (set-language-info-alist
  "Tajik" `((coding-system cyrillic-koi8-t)
-                    (coding-priority cyrillic-koi8-t)
-                    (nonascii-translation
-                     . ,(get 'decode-koi8-t 'translation-table))
-                    (input-method . "russian-typewriter") ; fixme?
-                    (features code-pages)
-                    (documentation . "Support for Tajik using KOI8-T."))
+          (coding-priority cyrillic-koi8-t)
+          (nonascii-translation
+           . ,(get 'decode-koi8-t 'translation-table))
+          (input-method . "russian-typewriter") ; fixme?
+          (features code-pages)
+          (documentation . "Support for Tajik using KOI8-T."))
  '("Cyrillic"))
 
 (set-language-info-alist
@@ -452,7 +468,8 @@ This works whether or not the table is Unicode-based or
               (input-method . "bulgarian-bds")
                  (features code-pages)
               (documentation
-               . "Support for Bulgarian with windows-1251 character set."))
+               . "Support for Bulgarian with windows-1251 character set.")
+              (tutorial . "TUTORIAL.bg"))
  '("Cyrillic"))
 
 (set-language-info-alist