(alternativnyj): Use new table.

(cp866): Define standalone, not as alias.
(ibm866): Change alias.
(ibm1047): New.

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 6426b17bea1c941b2345e47226bd97fdc0898626..04436aa5f46b06140859f3ced34b4a13cf82b22d 100644 (file)
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -505,13 +505,15 @@
   :short-name "alternativnyj"
   :ascii-compatible-p t
   :code-space [0 255]
+  :map "alternativnyj")
+
+(define-charset 'cp866
+  "CP866"
+  :short-name "cp866"
+  :ascii-compatible-p t
+  :code-space [0 255]
   :map "ibm866")
-;; Fixme: http://czyborra.com/charsets/cyrillic.html says the
-;; following, but the iconv map for cp866 isn't the same as his chart
-;; for alternativnyj.  I can't find anything that looks like an
-;; official definition of alternativnyj.
-(define-charset-alias 'cp866 'alternativnyj)
-(define-charset-alias 'ibm866 'alternativnyj)
+(define-charset-alias 'ibm866 'cp866)
 
 (define-charset 'koi8-u
   "KOI8-U"
@@ -948,6 +950,15 @@
   :mime-charset 'ebcdic-uk
   :map "ebcdic-uk")
 
+(define-charset 'ibm1047
+  ;; Says groff:
+  "IBM1047, some form of EBCDIC used by OS/390 Unix."
+  :short-name "IBM1047"
+  :code-space [0 255]
+  :mime-charset 'ibm1047
+  :map "ibm1047")
+(define-charset-alias 'cp1047 'ibm1047)
+
 (define-charset 'hp-roman8
   "Encoding used by Hewlet-Packard printer software"
   :short-name "HP-ROMAN8"