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 2ee1c96..1ae1f46 100644 (file)
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -1,7 +1,11 @@
-;;; ethiopic.el --- Support for Ethiopic -*- coding: iso-2022-7bit; -*-
+;;; ethiopic.el --- support for Ethiopic -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; 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
 
@@ -19,10 +23,12 @@
 
 ;; 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; 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:
 
@@ -57,6 +63,26 @@
              (input-method . "ethiopic")
              (features ethio-util)
              (sample-text . "\e$(3$Q#U!.\e(B")
-             (documentation . t)))
+             (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