X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/38141d208d57576dd505ee0b54d21e55fa464360..6a43ef8e8508df7d732e639ec75f657f4363e27a:/lisp/language/english.el

diff --git a/lisp/language/english.el b/lisp/language/english.el
index 428d3560e2..6d106a5e07 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -1,20 +1,22 @@
 ;;; english.el --- support for English -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2001-2012  Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008
+;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   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
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,15 +24,13 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;; We need nothing special to support English on Emacs.  Selecting
 ;; English as a language environment is one of the ways to reset
-;; various multilingual environment to the original settting.
+;; various multilingual environment to the original setting.
 
 ;;; Code:
 
@@ -42,9 +42,28 @@
 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)))
 
-;;; arch-tag: e440bdb0-91b0-4fb4-ae38-425780f8f745
 ;;; english.el ends here