From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 25 Dec 2020 13:58:15 +0000 (+0200)
Subject: Fix last change
X-Git-Tag: emacs-28.0.90~4570
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9413dd2d12b4ecf1c76c805a24f46e830e1da3d;p=emacs.git

Fix last change

* lisp/international/mule-conf.el (ebcdic-int1, cp256, cp273)
(ebcdic-be, cp274, ebcdic-br, cp275, ebcdic-cp-dk, ebcdic-cp-no)
(cp277, ebcdic-cp-fi, ebcdic-cp-se, cp278, ebcdic-cp-it, cp280)
(ebcdic-jp-e, cp281, ebcdic-cp-es, cp284, ebcdic-cp-gb, cp285)
(ebcdic-jp-kana, cp290, ebcdic-cp-fr, cp297): Remove charset
aliases, they are not really needed.

* lisp/language/english.el (ibm275): Move from here...
* lisp/language/european.el (ibm275): ...to here.
---

diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index dd6d0326d73..3b436864f8d 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1081,8 +1081,6 @@
   :code-space [0 255]
   :mime-charset 'ibm256
   :map "IBM256")
-(define-charset-alias 'ebcdic-int1 'ibm256)
-(define-charset-alias 'cp256 'ibm256)
 
 (define-charset 'ibm273
   "Austrian / German version of EBCDIC"
@@ -1090,7 +1088,6 @@
   :code-space [0 255]
   :mime-charset 'ibm273
   :map "IBM273")
-(define-charset-alias 'cp273 'ibm273)
 
 (define-charset 'ibm274
   "Belgian version of EBCDIC"
@@ -1098,8 +1095,6 @@
   :code-space [0 255]
   :mime-charset 'ibm274
   :map "IBM274")
-(define-charset-alias 'ebcdic-be 'ibm274)
-(define-charset-alias 'cp274 'ibm274)
 
 (define-charset 'ibm275
   "Brazilian version of EBCDIC"
@@ -1107,8 +1102,6 @@
   :code-space [0 255]
   :mime-charset 'ibm275
   :map "IBM275")
-(define-charset-alias 'ebcdic-br 'ibm275)
-(define-charset-alias 'cp275 'ibm275)
 
 (define-charset 'ibm277
   "Danish / Norwegian version of EBCDIC"
@@ -1116,9 +1109,6 @@
   :code-space [0 255]
   :mime-charset 'ibm277
   :map "IBM277")
-(define-charset-alias 'ebcdic-cp-dk 'ibm277)
-(define-charset-alias 'ebcdic-cp-no 'ibm277)
-(define-charset-alias 'cp277 'ibm277)
 
 (define-charset 'ibm278
   "Finnish / Swedish version of EBCDIC"
@@ -1126,9 +1116,6 @@
   :code-space [0 255]
   :mime-charset 'ibm278
   :map "IBM278")
-(define-charset-alias 'ebcdic-cp-fi 'ibm278)
-(define-charset-alias 'ebcdic-cp-se 'ibm278)
-(define-charset-alias 'cp278 'ibm278)
 
 (define-charset 'ibm280
   "Italian version of EBCDIC"
@@ -1136,8 +1123,6 @@
   :code-space [0 255]
   :mime-charset 'ibm270
   :map "IBM280")
-(define-charset-alias 'ebcdic-cp-it 'ibm280)
-(define-charset-alias 'cp280 'ibm280)
 
 (define-charset 'ibm281
   "Japanese-E version of EBCDIC"
@@ -1145,8 +1130,6 @@
   :code-space [0 255]
   :mime-charset 'ibm281
   :map "IBM281")
-(define-charset-alias 'ebcdic-jp-e 'ibm281)
-(define-charset-alias 'cp281 'ibm281)
 
 (define-charset 'ibm284
   "Spanish version of EBCDIC"
@@ -1154,8 +1137,6 @@
   :code-space [0 255]
   :mime-charset 'ibm284
   :map "IBM284")
-(define-charset-alias 'ebcdic-cp-es 'ibm284)
-(define-charset-alias 'cp284 'ibm284)
 
 (define-charset 'ibm285
   "UK english version of EBCDIC"
@@ -1163,8 +1144,6 @@
   :code-space [0 255]
   :mime-charset 'ibm285
   :map "IBM285")
-(define-charset-alias 'ebcdic-cp-gb 'ibm285) ;; how this differs from ebcdic-uk?
-(define-charset-alias 'cp285 'ibm285)
 
 (define-charset 'ibm290
   "Japanese katakana version of EBCDIC"
@@ -1172,8 +1151,6 @@
   :code-space [0 255]
   :mime-charset 'ibm290
   :map "IBM290")
-(define-charset-alias 'ebcdic-jp-kana 'ibm290)
-(define-charset-alias 'cp290 'ibm290)
 
 (define-charset 'ibm297
   "French version of EBCDIC"
@@ -1181,8 +1158,6 @@
   :code-space [0 255]
   :mime-charset 'ibm297
   :map "IBM297")
-(define-charset-alias 'ebcdic-cp-fr 'ibm297)
-(define-charset-alias 'cp297 'ibm297)
 
 (define-charset 'ibm1047
   ;; Says groff:
diff --git a/lisp/language/english.el b/lisp/language/english.el
index d5254effa9d..b7af84c8f75 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -70,14 +70,6 @@ Nothing special is needed to handle English.")
 (define-coding-system-alias 'ebcdic-int 'ibm038)
 (define-coding-system-alias 'cp038 'ibm038)
 
-(define-coding-system 'ibm275
-  "Brazilian version of EBCDIC"
-  :coding-type 'charset
-  :charset-list '(ibm275)
-  :mnemonic ?*)
-(define-coding-system-alias 'ebcdic-br 'ibm275)
-(define-coding-system-alias 'cp275 'ibm275)
-
 ;; Make "ASCII" an alias of "English" language environment.
 (set-language-info-alist
  "ASCII" (cdr (assoc "English" language-info-alist)))
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 99f062215f6..1f9a15333ba 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -347,6 +347,14 @@ Latin-9 is sometimes nicknamed `Latin-0'."))
 (define-coding-system-alias 'ebcdic-be 'ibm274)
 (define-coding-system-alias 'cp274 'ibm274)
 
+(define-coding-system 'ibm275
+  "Brazilian version of EBCDIC"
+  :coding-type 'charset
+  :charset-list '(ibm275)
+  :mnemonic ?*)
+(define-coding-system-alias 'ebcdic-br 'ibm275)
+(define-coding-system-alias 'cp275 'ibm275)
+
 (define-coding-system 'ibm277
   "Danish / Norwegian version of EBCDIC"
   :coding-type 'charset