merge trunk

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 11aae483ba2cb3f357d4178455cc8a01620e9210..95a3671bdd14460313bf85b4de25eea2d4a59892 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-15  Kenichi Handa  <handa@m17n.org>
+
+       * quail/ethiopic.el ("ethiopic"): Do not refer to
+       ethio-prefer-ascii-punctuation.
+
 2011-11-20  Juanma Barranquero  <lekktu@gmail.com>
 
        * quail/hangul.el (hangul-character): Fix typo.

diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index 7e108a71a6015676130efe5615f3b6721bb48c70..569d6e6b245783a258d3b7147f02330c200955c9 100644 (file)
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -39,7 +39,7 @@
  "ethiopic" "Ethiopic"
  '("\e$(3$Q#U!.\e(B "
    (ethio-prefer-ascii-space "_" "\e$(3$h\e(B")
-   (ethio-prefer-ascii-punctuation "." "\e$(3$i\e(B"))
+   "\e$(3$i\e(B")
  t "  Quail package for Ethiopic (Tigrigna and Amharic)
 
 When you are in Ethiopic language environment, the following special

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb412197f3dc675ae31b44d8b85b95904146965c..e718222e01b4cec0c12ab1241cefcf0f658f64f9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-15  Kenichi Handa  <handa@m17n.org>
+
+       * language/ethio-util.el: Change coding tag to utf-8-emacs.
+       (setup-ethiopic-environment-internal): Comment out key-binding for
+       ethio-toggle-punctuation.
+
 2011-12-13  Alan Mackenzie  <acm@muc.de>
 
        Add the switch statement to AWK Mode.

diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 306a7bee9dc690c14e9ea860d0ff348db902b472..3c39b1eff9cae5ae4f48a7f0a4f8b9007581d8b5 100644 (file)
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -1,4 +1,4 @@
-;;; ethio-util.el --- utilities for Ethiopic   -*- coding: utf-8; -*-
+;;; ethio-util.el --- utilities for Ethiopic   -*- coding: utf-8-emacs; -*-
 
 ;; Copyright (C) 1997-1998, 2002-2011  Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -48,7 +48,7 @@
                        ([f4] . ethio-sera-to-fidel-buffer)
                        ([S-f4] . ethio-sera-to-fidel-region)
                        ([C-f4] . ethio-sera-to-fidel-marker)
-                       ([S-f5] . ethio-toggle-punctuation)
+                       ;; ([S-f5] . ethio-toggle-punctuation)
                        ([S-f6] . ethio-modify-vowel)
                        ([S-f7] . ethio-replace-space)
                        ;; ([S-f8] . ethio-input-special-character) ; deprecated