(cyrillic-koi8): Add charset-origin-alist property.

(cyrillic-alternativnyj): Likewise.
("Cyrillic-KOI8"): Remove charset-origin-alist property.
("Cyrillic-ALT"): Likewise.

diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 0417db2c387e73d7e818ddcedf4891ba351e2095..5e0d0c662e221500520242153ef8b9f8f7a52d6a 100644 (file)
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -122,7 +122,9 @@
  '(ccl-decode-koi8 . ccl-encode-koi8)
  '((safe-charsets ascii cyrillic-iso8859-5)
    (mime-charset . koi8-r)
-   (valid-codes (0 . 127) 163 179 (192 . 255))))
+   (valid-codes (0 . 127) 163 179 (192 . 255))
+   (charset-origin-alist (cyrillic-iso8859-5 "KOI8-R"
+                                            cyrillic-encode-koi8-r-char))))
 
 (define-coding-system-alias 'koi8-r 'cyrillic-koi8)
 (define-coding-system-alias 'koi8 'cyrillic-koi8)
@@ -144,8 +146,6 @@
  "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")
@@ -218,7 +218,10 @@
  "ALTERNATIVNYJ 8-bit encoding for Cyrillic"
  '(ccl-decode-alternativnyj . ccl-encode-alternativnyj)
  '((safe-charsets ascii cyrillic-iso8859-5)
-   (valid-codes (0 . 175) (224 . 241) 255)))
+   (valid-codes (0 . 175) (224 . 241) 255)
+   (charset-origin-alist (cyrillic-iso8859-5 "ALTERNATIVNYJ"
+                                            cyrillic-encode-koi8-r-char))))
+
 
 (define-coding-system-alias 'alternativnyj 'cyrillic-alternativnyj)
 
@@ -240,9 +243,6 @@
  "Cyrillic-ALT" `((charset cyrillic-iso8859-5)
                  (nonascii-translation
                   . ,cyrillic-alternativnyj-nonascii-translation-table)
-                 (charset-origin-alist
-                  (cyrillic-iso8859-5 "ALTERNATIVNYJ"
-                                      cyrillic-encode-koi8-r-char))
                  (coding-system cyrillic-alternativnyj)
                  (coding-priority cyrillic-alternativnyj)
                  (input-method . "cyrillic-yawerty")