("Windows-1251"): Deleted.

("Bulgarian", "Belarusian"): Remove `features'.
(windows-1251): Moved from code-pages.

diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 8549a6de55de0e05727fa595ffea0d251c5dfcad..9c9c2fd54eb861a3009f173b41443b44e39486fe 100644 (file)
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -329,7 +329,6 @@ Support for Russian using koi8-r and the russian-computer input method.")
                . ,(get 'cyrillic-koi8-u-nonascii-translation-table
                        'translation-table))
               (input-method . "ukrainian-computer")
-              (features code-pages)
               (documentation
                . "Support for Ukrainian with KOI8-U character set."))
  '("Cyrillic"))
@@ -440,16 +439,6 @@ Support for Russian using koi8-r and the russian-computer input method.")
                  (documentation . "Support for Cyrillic ALTERNATIVNYJ."))
  '("Cyrillic"))
 
-(set-language-info-alist
- "Windows-1251" `((coding-system windows-1251)
-                 (coding-priority windows-1251)
-                 (nonascii-translation
-                  . ,(get 'decode-windows-1252 'translation-table))
-                 (input-method . "russian-typewriter") ; fixme?
-                 (features code-pages)
-                 (documentation . "Support for windows-1251 character set."))
- '("Cyrillic"))
-
 (set-language-info-alist
  "Tajik" `((coding-system cyrillic-koi8-t)
           (coding-priority cyrillic-koi8-t)
@@ -460,13 +449,26 @@ Support for Russian using koi8-r and the russian-computer input method.")
           (documentation . "Support for Tajik using KOI8-T."))
  '("Cyrillic"))
 
+(eval-and-compile
+  (setq
+   non-iso-charset-alist
+   (cp-make-coding-system
+    windows-1251
+    [?\\e$,1("\e(B ?\\e$,1(#\e(B ?\\e$,1rz\e(B ?\\e$,1(s\e(B ?\\e$,1r~\e(B ?\\e$,1s&\e(B ?\\e$,1s \e(B ?\\e$,1s!\e(B ?\\e$,1tL\e(B ?\\e$,1s0\e(B ?\\e$,1()\e(B ?\\e$,1s9\e(B ?\\e$,1(*\e(B ?\\e$,1(,\e(B ?\\e$,1(+\e(B ?\\e$,1(/\e(B ?\\e$,1(r\e(B
+        ?\\e$,1rx\e(B ?\\e$,1ry\e(B ?\\e$,1r|\e(B ?\\e$,1r}\e(B ?\\e$,1s"\e(B ?\\e$,1rs\e(B ?\\e$,1rt\e(B nil ?\\e$,1ub\e(B ?\\e$,1(y\e(B ?\\e$,1s:\e(B ?\\e$,1(z\e(B ?\\e$,1(|\e(B ?\\e$,1({\e(B ?\\e$,1(\7f\e(B ?\\e,A \e(B ?\\e$,1(.\e(B
+        ?\\e$,1(~\e(B ?\\e$,1((\e(B ?\\e,A$\e(B ?\\e$,1)P\e(B ?\\e,A&\e(B ?\\e,A'\e(B ?\\e$,1(!\e(B ?\\e,A)\e(B ?\\e$,1($\e(B ?\\e,A+\e(B ?\\e,A,\e(B ?\\e,A-\e(B ?\\e,A.\e(B ?\\e$,1('\e(B ?\\e,A0\e(B ?\\e,A1\e(B ?\\e$,1(&\e(B
+        ?\\e$,1(v\e(B ?\\e$,1)Q\e(B ?\\e,A5\e(B ?\\e,A6\e(B ?\\e,A7\e(B ?\\e$,1(q\e(B ?\\e$,1uV\e(B ?\\e$,1(t\e(B ?\\e,A;\e(B ?\\e$,1(x\e(B ?\\e$,1(%\e(B ?\\e$,1(u\e(B ?\\e$,1(w\e(B ?\\e$,1(0\e(B ?\\e$,1(1\e(B ?\\e$,1(2\e(B ?\\e$,1(3\e(B
+        ?\\e$,1(4\e(B ?\\e$,1(5\e(B ?\\e$,1(6\e(B ?\\e$,1(7\e(B ?\\e$,1(8\e(B ?\\e$,1(9\e(B ?\\e$,1(:\e(B ?\\e$,1(;\e(B ?\\e$,1(<\e(B ?\\e$,1(=\e(B ?\\e$,1(>\e(B ?\\e$,1(?\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(P\e(B ?\\e$,1(Q\e(B ?\\e$,1(R\e(B ?\\e$,1(S\e(B ?\\e$,1(T\e(B ?\\e$,1(U\e(B
+        ?\\e$,1(V\e(B ?\\e$,1(W\e(B ?\\e$,1(X\e(B ?\\e$,1(Y\e(B ?\\e$,1(Z\e(B ?\\e$,1([\e(B ?\\e$,1(\\e(B ?\\e$,1(]\e(B ?\\e$,1(^\e(B ?\\e$,1(_\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] nil ?b)))
+
 (set-language-info-alist
  "Bulgarian" `((coding-system windows-1251)
                  (coding-priority windows-1251)
               (nonascii-translation
                . ,(get 'decode-windows-1251 'translation-table))
               (input-method . "bulgarian-bds")
-                 (features code-pages)
               (documentation
                . "Support for Bulgarian with windows-1251 character set.")
               (tutorial . "TUTORIAL.bg"))
@@ -478,7 +480,6 @@ Support for Russian using koi8-r and the russian-computer input method.")
                (nonascii-translation
                 . ,(get 'decode-windows-1251 'translation-table))
                (input-method . "belarusian")
-               (features code-pages)
                (documentation
                 . "Support for Belarusian with windows-1251 character set.
 \(The name Belarusian replaced Byelorussian in the early 1990s.)"))