Add new maintainer (deego).

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

diff --git a/lisp/language/english.el b/lisp/language/english.el
index e4ff06861ad978c4854728a39480926c69fb8462..af7dbafdb71b3340c444bc49d2e67e9f42ae7d9e 100644 (file)
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -1,7 +1,7 @@
-;;; english.el --- English support
+;;; english.el --- support for English -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1997 Free Software Foundation, Inc.
 ;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
+;; Licensed to the Free Software Foundation.
 
 ;; Keywords: multibyte character, character set, syntax, category
 
@@ -28,47 +28,18 @@
 ;; English as a language environment is one of the ways to reset
 ;; various multilingual environment to the original settting.
 
-;;; Code
-
-(defun setup-english-environment ()
-  "Reset MULE (multilingual environment) to the default status."
-  (interactive)
-  (setq-default enable-multibyte-characters t)
-  (if (local-variable-p 'enable-multibyte-characters)
-      (setq enable-multibyte-characters t))
-
-  (setq coding-category-internal       'internal
-       coding-category-iso-7           'iso-2022-7
-       coding-category-iso-8-1         'iso-8859-1
-       coding-category-iso-8-2         'iso-8859-1
-       coding-category-iso-else        'iso-8859-1
-       coding-category-sjis            'sjis
-       coding-category-big5            'big5
-       coding-category-binary          'no-conversion)
-
-  (set-coding-priority
-   '(coding-category-iso-7
-     coding-category-iso-8-2
-     coding-category-iso-8-1
-     coding-category-iso-else
-     coding-category-internal 
-     coding-category-binary
-     coding-category-sjis
-     coding-category-big5))
-
-  (setq-default buffer-file-coding-system 'iso-8859-1)
-  (set-terminal-coding-system 'iso-8859-1)
-  (set-keyboard-coding-system 'iso-8859-1)
-  )
+;;; Code:
 
 (set-language-info-alist
- "English" '((setup-function . setup-english-environment)
-            (tutorial . "TUTORIAL")
-            (charset . (ascii))
-            (documentation . t)
-            (sample-text . "Hello!, Hi!, How are you?")))
-
-(register-input-method "English"
-                      '("quail-dvorak" quail-use-package "quail/latin"))
+ "English" '((tutorial . "TUTORIAL")
+            (charset ascii)
+            (sample-text . "Hello!, Hi!, How are you?")
+            (documentation . "\
+Nothing special is needed to handle English.")
+            ))
+
+;; Make "ASCII" an alias of "English" language environment.
+(set-language-info-alist
+ "ASCII" (cdr (assoc "English" language-info-alist)))
 
 ;;; english.el ends here