(setup-english-environment): Just call `reset-language-environment'.

- Don't setup `setup-function' property of English environment.

diff --git a/lisp/mule/english.el b/lisp/mule/english.el
index 60731be..640a472 100644 (file)
--- a/lisp/mule/english.el
+++ b/lisp/mule/english.el
@@ -1,8 +1,7 @@
 ;;; english.el --- English support
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
+;; Copyright (C) 1997,1999 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
-;; Copyright (C) 1997 MORIOKA Tomohiko
 
 ;; Keywords: multibyte character, character set, syntax, category
 
@@ -29,90 +28,17 @@
 ;; English as a language environment is one of the ways to reset
 ;; various multilingual environment to the original settting.
 
-;; modified for XEmacs by MORIOKA Tomohiko
-
 ;;; Code
 
 (defun setup-english-environment ()
   "Reset multilingual environment of Emacs to the default status.
-The default status is as follows.
-
-  The default value of enable-multibyte-characters is t.
-
-  The default value of buffer-file-coding-system is nil.
-  The coding system for terminal output is nil.
-  The coding system for keyboard input is nil.
-
-  The order of priorities of coding categories and the coding system
-  bound to each category are as follows
-       coding category                 coding system
-       --------------------------------------------------
-       coding-category-iso-7           iso-2022-7bit
-       coding-category-iso-8-1         iso-8859-1
-       coding-category-iso-8-2         iso-8859-1
-       coding-category-iso-7-else      iso-2022-7bit-lock
-       coding-category-iso-8-else      iso-2022-8bit-ss2
-       coding-category-emacs-mule      no-conversion
-       coding-category-sjis            japanese-shift-jis
-       coding-category-big5            chinese-big5
-       coding-category-binarry         no-conversion
-"
+See the function `reset-language-environment' for more detail."
   (interactive)
-  ;; (setq-default enable-multibyte-characters t)
-
-  ;; (setq coding-category-iso-7           'iso-2022-7bit
-  ;;       coding-category-iso-8-1         'iso-8859-1
-  ;;       coding-category-iso-8-2         'iso-8859-1
-  ;;       coding-category-iso-7-else      'iso-2022-7bit-lock
-  ;;       coding-category-iso-8-else      'iso-2022-8bit-ss2
-  ;;       coding-category-emacs-mule      'no-conversion
-  ;;       coding-category-sjis            'japanese-shift-jis
-  ;;       coding-category-big5            'chinese-big5
-  ;;       coding-category-binary          'binary)
-  (set-coding-category-system 'iso-7           'iso-2022-7bit)
-  (set-coding-category-system 'iso-8-1         'iso-8859-1)
-  (set-coding-category-system 'iso-8-2         'iso-8859-1)
-  (set-coding-category-system 'iso-lock-shift  'iso-2022-lock)
-  (set-coding-category-system 'iso-8-designate 'ctext)
-  (set-coding-category-system 'no-conversion   'no-conversion)
-  (set-coding-category-system 'shift-jis       'shift_jis)
-  (set-coding-category-system 'big5            'big5)
-  
-  ;; (set-coding-priority
-  ;;  '(coding-category-iso-7
-  ;;    coding-category-iso-8-2
-  ;;    coding-category-iso-8-1
-  ;;    coding-category-iso-7-else
-  ;;    coding-category-iso-8-else
-  ;;    coding-category-emacs-mule 
-  ;;    coding-category-raw-text
-  ;;    coding-category-sjis
-  ;;    coding-category-big5
-  ;;    coding-category-binary))
-  (set-coding-priority-list
-   '(iso-7
-     iso-8-2
-     iso-8-1
-     iso-8-designate
-     iso-lock-shift
-     no-conversion
-     shift-jis
-     big5))
-  
-  (set-default-coding-systems nil)
-  ;; Don't alter the terminal and keyboard coding systems here.
-  ;; The terminal still supports the same coding system
-  ;; that it supported a minute ago.
-;;;  (set-terminal-coding-system-internal nil)
-;;;  (set-keyboard-coding-system-internal nil)
-
-  ;;(setq nonascii-insert-offset 0)
-  )
+  (reset-language-environment))
 
 (set-language-info-alist
- "English" '((setup-function . setup-english-environment)
-            (tutorial . "TUTORIAL")
-            (charset . (ascii))
+ "English" '((tutorial . "TUTORIAL")
+            (charset ascii)
             (sample-text . "Hello!, Hi!, How are you?")
             (documentation . "\
 Nothing special is needed to handle English.")