(setup-ethiopic-environment): Bind

correct commands in global-map, rmail-mode-map, and mail-mode-map.
Set default value of default-input-method.

diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index c97f6f98802dc5e85e10ccdda352b4c53e1243d3..537f0cc1f9c1e30cb339712bde6e856c3fe06ecc 100644 (file)
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -34,16 +34,17 @@
   (setq primary-language "Ethiopic")
 
   (setq default-input-method "ethiopic")
+  (setq-default default-input-method "ethiopic")
 
   ;;
   ;;  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 [f4] 'ethio-sera-to-fidel-buffer)
+  (define-key global-map [S-f4] 'ethio-sera-to-fidel-region)
+  (define-key global-map [C-f4] 'ethio-sera-to-fidel-marker)
+  (define-key global-map [f5] 'ethio-fidel-to-sera-buffer)
+  (define-key global-map [S-f5] 'ethio-fidel-to-sera-region)
+  (define-key global-map [C-f5] 'ethio-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)
@@ -52,14 +53,14 @@
   (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)))
+      (define-key rmail-mode-map [C-f4] 'ethio-sera-to-fidel-mail)
+      (define-key rmail-mode-map [C-f5] 'ethio-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)))
+      (define-key mail-mode-map [C-f4] 'ethio-sera-to-fidel-mail)
+      (define-key mail-mode-map [C-f5] 'ethio-fidel-to-sera-mail)))
   )
 
 ;;