(cyrillic-alternativnyj-decode-table): Fix

the table.
(cyrillic-alternativnyj): Don't give it `mime-charset' property.
(cp866): Delete this alias.
("Bulgarian"): Fix the value of `input-method'.

diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 21c72f544ce863f84a346dd6991f54bbaa87764c..8b47ca324b52ee77d0d7f7d65fa837897efdcfbf 100644 (file)
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -314,7 +314,7 @@ This works whether or not the table is Unicode-based or
 
 ;; Fixme: It's unclear what's the correct table.  I've found
 ;; statements both that it's the same as cp866 and somewhat different,
-;; but nothing that looks definitive.
+;; but nothing that looks really definitive.
 (defvar cyrillic-alternativnyj-decode-table
   [
    0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
@@ -332,7 +332,7 @@ This works whether or not the table is Unicode-based or
 ;;    ?\e$,2 4\e(B  ?\e$,2 T\e(B  ?\e$,2 L\e(B  ?\e$,2 <\e(B  ?\e$,2  \e(B  ?\e$,2 \\e(B  ?\e$,2 ~\e(B  ?\e$,2 \7f\e(B  ?\e$,2 z\e(B  ?\e$,2 t\e(B  ?\e$,2!)\e(B  ?\e$,2!&\e(B  ?\e$,2! \e(B  ?\e$,2 p\e(B  ?\e$,2!,\e(B  ?\e$,2!'\e(B
 ;;    ?\e$,2!(\e(B  ?\e$,2!$\e(B  ?\e$,2!%\e(B  ?\e$,2 y\e(B  ?\e$,2 x\e(B  ?\e$,2 r\e(B  ?\e$,2 s\e(B  ?\e$,2!+\e(B  ?\e$,2!*\e(B  ?\e$,2 8\e(B  ?\e$,2 ,\e(B  ?\e$,2!H\e(B  ?\e$,2!D\e(B  ?\e$,2!L\e(B  ?\e$,2!P\e(B  ?\e$,2!@\e(B
 ;;    ?\e$,1(`\e(B  ?\e$,1(a\e(B  ?\e$,1(b\e(B  ?\e$,1(c\e(B  ?\e$,1(d\e(B  ?\e$,1(e\e(B  ?\e$,1(f\e(B  ?\e$,1(g\e(B  ?\e$,1(h\e(B  ?\e$,1(i\e(B  ?\e$,1(j\e(B  ?\e$,1(k\e(B  ?\e$,1(l\e(B  ?\e$,1(m\e(B  ?\e$,1(n\e(B  ?\e$,1(o\e(B
-;;    ?\e$,1(!\e(B  ?\e$,1(q\e(B  ?\e$,1($\e(B  ?\e$,1(t\e(B  ?\e$,1('\e(B  ?\e$,1(w\e(B  ?\e$,1(.\e(B  ?\e$,1(~\e(B  ?\e,A0\e(B  ?\e$,1s"\e(B  ?\e,A7\e(B  ?\e$,1x:\e(B  ?\e$,1uV\e(B  ?\e,A$\e(B  ?\e$,2!`\e(B  ?\e,A \e(B ;
+;;    ?\e$,1(!\e(B  ?\e$,1(q\e(B  ?\e$,1ry\e(B  ?\e$,1rx\e(B  ?\e$,1%A\e(B  ?\e$,1%@\e(B  ?\e$,1s:\e(B  ?\e$,1s9\e(B  ?\e$,1vq\e(B  ?\e$,1vs\e(B  ?\e,A1\e(B  ?\e,Aw\e(B  ?\e$,1uV\e(B  ?\e,A$\e(B  ?\e$,2!`\e(B  ?\e,A \e(B ;
 ;; 8859+Unicode
    ?\e,L0\e(B  ?\e,L1\e(B  ?\e,L2\e(B  ?\e,L3\e(B  ?\e,L4\e(B  ?\e,L5\e(B  ?\e,L6\e(B  ?\e,L7\e(B  ?\e,L8\e(B  ?\e,L9\e(B  ?\e,L:\e(B  ?\e,L;\e(B  ?\e,L<\e(B  ?\e,L=\e(B  ?\e,L>\e(B  ?\e,L?\e(B
    ?\e,L@\e(B  ?\e,LA\e(B  ?\e,LB\e(B  ?\e,LC\e(B  ?\e,LD\e(B  ?\e,LE\e(B  ?\e,LF\e(B  ?\e,LG\e(B  ?\e,LH\e(B  ?\e,LI\e(B  ?\e,LJ\e(B  ?\e,LK\e(B  ?\e,LL\e(B  ?\e,LM\e(B  ?\e,LN\e(B  ?\e,LO\e(B
@@ -341,7 +341,10 @@ This works whether or not the table is Unicode-based or
    ?\e$,2 4\e(B  ?\e$,2 T\e(B  ?\e$,2 L\e(B  ?\e$,2 <\e(B  ?\e$,2  \e(B  ?\e$,2 \\e(B  ?\e$,2 ~\e(B  ?\e$,2 \7f\e(B  ?\e$,2 z\e(B  ?\e$,2 t\e(B  ?\e$,2!)\e(B  ?\e$,2!&\e(B  ?\e$,2! \e(B  ?\e$,2 p\e(B  ?\e$,2!,\e(B  ?\e$,2!'\e(B
    ?\e$,2!(\e(B  ?\e$,2!$\e(B  ?\e$,2!%\e(B  ?\e$,2 y\e(B  ?\e$,2 x\e(B  ?\e$,2 r\e(B  ?\e$,2 s\e(B  ?\e$,2!+\e(B  ?\e$,2!*\e(B  ?\e$,2 8\e(B  ?\e$,2 ,\e(B  ?\e$,2!H\e(B  ?\e$,2!D\e(B  ?\e$,2!L\e(B  ?\e$,2!P\e(B  ?\e$,2!@\e(B
    ?\e,L`\e(B  ?\e,La\e(B  ?\e,Lb\e(B  ?\e,Lc\e(B  ?\e,Ld\e(B  ?\e,Le\e(B  ?\e,Lf\e(B  ?\e,Lg\e(B  ?\e,Lh\e(B  ?\e,Li\e(B  ?\e,Lj\e(B  ?\e,Lk\e(B  ?\e,Ll\e(B  ?\e,Lm\e(B  ?\e,Ln\e(B  ?\e,Lo\e(B
-   ?\e,L!\e(B  ?\e,Lq\e(B  ?\e,L$\e(B  ?\e,Lt\e(B  ?\e,L'\e(B  ?\e,Lw\e(B  ?\e,L.\e(B  ?\e,L~\e(B  ?\e,A0\e(B  ?\e$,1s"\e(B  ?\e,A7\e(B  ?\e$,1x:\e(B  ?\e,Lp\e(B  ?\e,A$\e(B  ?\e$,2!`\e(B  ?\e,L \e(B]
+   ;; Taken from http://www.cyrillic.com/ref/cyrillic/koi-8alt.html
+   ;; with guesses for the Unicodes of the glyphs in the absence of a
+   ;; table.
+   ?\e,L!\e(B  ?\e,Lq\e(B  ?\e$,1ry\e(B  ?\e$,1rx\e(B  ?\e$,1%A\e(B  ?\e$,1%@\e(B  ?\e$,1s:\e(B  ?\e$,1s9\e(B  ?\e$,1vq\e(B  ?\e$,1vs\e(B  ?\e,A1\e(B  ?\e,Aw\e(B  ?\e,Lp\e(B  ?\e,A$\e(B  ?\e$,2!`\e(B  ?\e,L \e(B]
   "Cyrillic ALTERNATIVNYJ decoding table.")
 
 (let ((table (make-translation-table-from-vector
@@ -377,19 +380,15 @@ This works whether or not the table is Unicode-based or
 
 (cyrillic-unify-encoding 'cyrillic-alternativnyj-encode-table)
 
-;; Fixme: Check the cp866 here and in alias below.  See comment on the
-;; decode table above.
 (make-coding-system
  'cyrillic-alternativnyj 4 ?A
- "ALTERNATIVNYJ (CP866) 8-bit encoding for Cyrillic."
+ "ALTERNATIVNYJ 8-bit encoding for Cyrillic."
  '(ccl-decode-alternativnyj . ccl-encode-alternativnyj)
  `((safe-chars . cyrillic-alternativnyj-encode-table)
    (valid-codes (0 . 255))
-   (mime-charset . cp866)
    (dependency unify-8859-on-encoding-mode unify-8859-on-decoding-mode)))
 
 (define-coding-system-alias 'alternativnyj 'cyrillic-alternativnyj)
-(define-coding-system-alias 'cp866 'cyrillic-alternativnyj)
 
 (define-ccl-program ccl-encode-alternativnyj-font
   `(0
@@ -438,7 +437,7 @@ This works whether or not the table is Unicode-based or
                  (coding-priority windows-1251)
               (nonascii-translation
                . ,(get 'decode-windows-1251 'translation-table))
-              (input-method . "bulgarian-standard")
+              (input-method . "bulgarian-bds")
                  (features code-pages)
               (documentation
                . "Support for Bulgrian with windows-1251 character set."))