Merge from emacs--rel--22

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

diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 8e3acf8..1ae1f46 100644 (file)
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -1,7 +1,11 @@
-;;; ethiopic.el --- Support for Ethiopic
+;;; ethiopic.el --- support for Ethiopic -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Free Software Foundation, Inc.
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: multilingual, Ethiopic
 
@@ -18,10 +22,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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; 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.
 
-;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
+;; Author: TAKAHASHI Naoto <ntakahas@m17n.org>
+
+;;; Commentary:
 
 ;;; Code:
 
@@ -42,50 +49,40 @@
           ((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 .
+"This language envrironment provides these function key bindings
+    \(old bindings are shown in parentheses):
+    [f3]   ethio-fidel-to-sera-buffer         (f5)
+    [S-f3] ethio-fidel-to-sera-region         (f5)
+    [C-f3] ethio-fidel-to-sera-mail-or-marker (f5)
+
+    [f4]   ethio-sera-to-fidel-buffer         (unchanged)
+    [S-f4] ethio-sera-to-fidel-region         (unchanged)
+    [C-f4] ethio-sera-to-fidel-mail-or-marker (unchanged)
+
+    [S-f5] ethio-toggle-punctuation           (f3)
+    [S-f6] ethio-modify-vowel                 (f6)
+    [S-f7] ethio-replace-space                (f7)
+    [S-f8] ethio-input-special-character      (f8)
+    [S-f9] ethio-replace-space                (unchanged)
+    [C-f9] ethio-toggle-space                 (f2)"
+)))
+
+(provide 'ethiopic)
+
+;;; arch-tag: e81329d9-1286-43ba-92fd-54ce5c7b213c
 ;;; ethiopic.el ends here