Merge from mainline.

[bpt/emacs.git] / leim / quail / ethiopic.el

diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index 9295704..210aeea 100644 (file)
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -1,16 +1,18 @@
-;;; ethiopic.el --- Quail package for inputting Ethiopic characters
+;;; ethiopic.el --- Quail package for inputting Ethiopic characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007, 2008, 2009, 2010, 2011
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: multilingual, input method, ethiopic
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +20,7 @@
 ;; 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; Author: TAKAHASHI Naoto <ntakahas@etl.go.jp>
 
@@ -30,7 +30,7 @@
 
 (require 'quail)
 (require 'ethio-util)
-               
+
 ;;
 ;; The package "ethiopic"
 ;;
@@ -62,7 +62,7 @@ S-SPC or `M-x ethio-insert-ethio-space'
 
 C-' or `M-x ethio-gemination'
   Compose the character before the point with the Ethiopic gemination mark.
-  If the characater is already composed, decompose it and remove the
+  If the character is already composed, decompose it and remove the
   gemination mark."
 
  ;; The following keys should work as defined in lisp/language/ethio-util,
@@ -342,7 +342,7 @@ C-' or `M-x ethio-gemination'
  ("qqee" ?\e$(3%-\e(B)
  ("qq" ?\e$(3%.\e(B)
  ("qqo" ?\e$(3%/\e(B)
- 
+
  ("Qe" ?\e$(3!q\e(B)
  ("Qu" ?\e$(3!r\e(B)
  ("Qi" ?\e$(3!s\e(B)
@@ -1141,7 +1141,7 @@ C-' or `M-x ethio-gemination'
 
 (defun ethio-select-a-translation ()
   ;; The translation of `a' depends on the language
-  ;; (either Tigrigna or Amharic). 
+  ;; (either Tigrigna or Amharic).
   (quail-defrule "a"
                 (if (ethio-prefer-amharic-p) ?\e$(3"c\e(B ?\e$(3"f\e(B)
                 "ethiopic"))