("LANUGAGE-ENVIRONMENT"): Delete property setup-function or change

[bpt/emacs.git] / lisp / language / ethiopic.el

diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 7ca8e25..1f348bc 100644 (file)
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -1,7 +1,7 @@
 ;;; ethiopic.el --- Support for Ethiopic
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
 ;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
+;; Licensed to the Free Software Foundation.
 
 ;; Keywords: multilingual, Ethiopic
 
@@ -43,50 +43,20 @@
           ((r1 = ?\x13) (r2 -= 256))
         ((r1 = ?\xfd) (r2 -= 208))
         ))))
-  "CCL program to encode an Ehitopic code to code point of Ehitopic font.")
+  "CCL program to encode an Ethiopic code to code point of Ethiopic font.")
 
 (setq font-ccl-encoder-alist
       (cons (cons "ethiopic" ccl-encode-ethio-font) font-ccl-encoder-alist))
 
-(register-input-method
- "Ethiopic" '("quail-ethio" quail-use-package "quail/ethiopic"))
-
-(defun setup-ethio-environment ()
-  (setq primary-language "Ethiopic")
-
-  (setq default-input-method '("Ethiopic" . "quail-ethio"))
-
-  ;;
-  ;;  key bindings
-  ;;
-  (define-key global-map [f4] 'sera-to-fidel-buffer)
-  (define-key global-map [S-f4] 'sera-to-fidel-region)
-  (define-key global-map [C-f4] 'sera-to-fidel-marker)
-  (define-key global-map [f5] 'fidel-to-sera-buffer)
-  (define-key global-map [S-f5] 'fidel-to-sera-region)
-  (define-key global-map [C-f5] 'fidel-to-sera-marker)
-  (define-key global-map [f6] 'ethio-modify-vowel)
-  (define-key global-map [f7] 'ethio-replace-space)
-  (define-key global-map [f8] 'ethio-input-special-character)
-  (define-key global-map [S-f2] 'ethio-replace-space) ; as requested
-
-  (add-hook
-   'rmail-mode-hook
-   '(lambda ()
-      (define-key rmail-mode-map [C-f4] 'sera-to-fidel-mail)
-      (define-key rmail-mode-map [C-f5] 'fidel-to-sera-mail)))
-
-  (add-hook
-   'mail-mode-hook
-   '(lambda ()
-      (define-key mail-mode-map [C-f4] 'sera-to-fidel-mail)
-      (define-key mail-mode-map [C-f5] 'fidel-to-sera-mail)))
-  )
-
 (set-language-info-alist
- "Ethiopic" '((setup-function . setup-ethio-environment)
-             (charset . (ethiopic))
-             (documentation . t)
-             (sample-text . "\e$(3$O#U!.\e(B")))
+ "Ethiopic" '((setup-function . setup-ethiopic-environment-internal)
+             (exit-function . exit-ethiopic-environment)
+             (charset ethiopic)
+             (coding-system iso-2022-7bit)
+             (coding-priority iso-2022-7bit)
+             (input-method . "ethiopic")
+             (features ethio-util)
+             (sample-text . "\e$(3$Q#U!.\e(B")
+             (documentation . t)))
 
 ;;; ethiopic.el ends here