3 files changed, 55 insertions, 12 deletions

diff --git a/etc/NEWS b/etc/NEWS
index c82e503195e..8870900c24f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1502,6 +1502,27 @@ methods in Leim.
 These new environments mainly select appropriate translations
 of the tutorial.
 
+** In Ethiopic language environment, special key bindings for
+function keys are changed as follows.  This is to conform to "Emacs
+Lisp Coding Convention".
+
+    new  command                            old-binding
+    ---  -------                            -----------
+    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
+
 +++
 ** Fortran mode has a new command `fortran-strip-sequence-nos' to
 remove text past column 72.  The syntax class of `\' in Fortran is now
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a651dc29d55..858526b424b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,4 @@
-2001-02-28  Kenichi Handa  <handa@etl.go.jp>
+2001-02-28  TAKAHASHI Naoto  <ntakahas@m17n.org>
 
         * language/ethio-util.el (setup-ethiopic-environment-internal):
         Change bindings of functions keys to conform to "Emacs Lisp Coding
@@ -6,6 +6,8 @@
 
         * language/ethiopic.el ("Ethiopic"): Add documentation.
 
+2001-02-28  Kenichi Handa  <handa@etl.go.jp>
+
         * international/utf-8.el (mule-utf-8): Set coding-category
         property to coding-category-utf-8.
 
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 43f2ad0ee1c..86e07e0c9d8 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -1,6 +1,6 @@
 ;;; ethio-util.el --- utilities for Ethiopic
 
-;; Copyright (C) 1997 Electrotechnical Laboratory, JAPAN.
+;; Copyright (C) 1997, 2001 Electrotechnical Laboratory, JAPAN.
 ;; Licensed to the Free Software Foundation.
 
 ;; Keywords: mule, multilingual, Ethiopic
@@ -22,7 +22,7 @@
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
-;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
+;; Author: TAKAHASHI Naoto <ntakahas@m17n.org>
 
 ;;; Code:
 
@@ -34,18 +34,38 @@
   (let ((key-bindings '((" " . ethio-insert-space)
                         ([?\S- ] . ethio-insert-ethio-space)
                         ([?\C-'] . ethio-gemination)
-                        ([f2] . ethio-toggle-space)
-                        ([S-f2] . ethio-replace-space) ; as requested
-                        ([f3] . ethio-toggle-punctuation)
+
+                        ;; these old bindings conflict
+                        ;; with Emacs' binding policy
+
+                        ;; ([f2] . ethio-toggle-space)
+                        ;; ([S-f2] . ethio-replace-space) ; as requested
+                        ;; ([f3] . ethio-toggle-punctuation)
+                        ;; ([f4] . ethio-sera-to-fidel-buffer)
+                        ;; ([S-f4] . ethio-sera-to-fidel-region)
+                        ;; ([C-f4] . ethio-sera-to-fidel-mail-or-marker)
+                        ;; ([f5] . ethio-fidel-to-sera-buffer)
+                        ;; ([S-f5] . ethio-fidel-to-sera-region)
+                        ;; ([C-f5] . ethio-fidel-to-sera-mail-or-marker)
+                        ;; ([f6] . ethio-modify-vowel)
+                        ;; ([f7] . ethio-replace-space)
+                        ;; ([f8] . ethio-input-special-character)
+
+                        ;; this is the rewritten bindings
+
+                        ([f3] . ethio-fidel-to-sera-buffer)
+                        ([S-f3] . ethio-fidel-to-sera-region)
+                        ([C-f3] . ethio-fidel-to-sera-mail-or-marker)
                         ([f4] . ethio-sera-to-fidel-buffer)
                         ([S-f4] . ethio-sera-to-fidel-region)
                         ([C-f4] . ethio-sera-to-fidel-mail-or-marker)
-                        ([f5] . ethio-fidel-to-sera-buffer)
-                        ([S-f5] . ethio-fidel-to-sera-region)
-                        ([C-f5] . ethio-fidel-to-sera-mail-or-marker)
-                        ([f6] . ethio-modify-vowel)
-                        ([f7] . ethio-replace-space)
-                        ([f8] . ethio-input-special-character)))
+                        ([S-f5] . ethio-toggle-punctuation)
+                        ([S-f6] . ethio-modify-vowel)
+                        ([S-f7] . ethio-replace-space)
+                        ([S-f8] . ethio-input-special-character)
+                        ([C-f9] . ethio-toggle-space)
+                        ([S-f9] . ethio-replace-space) ; as requested
+                        ))
         kb)
     (while key-bindings
       (setq kb (car (car key-bindings)))