Merge from emacs--devo--0

[gnu-emacs] / lisp / language / english.el

diff --git a/lisp/language/english.el b/lisp/language/english.el
index d12ed650186f19e65bb7ca9a64ffdd3cc235c822..852c0c65bbbb3092e72223e045a084310644a757 100644 (file)
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -5,6 +5,9 @@
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
+;; Copyright (C) 2003
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H13PRO009
 
 ;; Keywords: multibyte character, character set, syntax, category
 
@@ -41,6 +44,26 @@
 Nothing special is needed to handle English.")
             ))
 
+;; Mostly because we can now...
+(define-coding-system 'ebcdic-us
+  "US version of EBCDIC"
+  :coding-type 'charset
+  :charset-list '(ebcdic-us)
+  :mnemonic ?*)
+
+(define-coding-system 'ebcdic-uk
+  "UK version of EBCDIC"
+  :coding-type 'charset
+  :charset-list '(ebcdic-uk)
+  :mnemonic ?*)
+
+(define-coding-system 'ibm1047
+  "A version of EBCDIC used in OS/390 Unix"  ; says Groff
+  :coding-type 'charset
+  :charset-list '(ibm1047)
+  :mnemonic ?*)
+(define-coding-system-alias 'cp1047 'ibm1047)
+
 ;; Make "ASCII" an alias of "English" language environment.
 (set-language-info-alist
  "ASCII" (cdr (assoc "English" language-info-alist)))