From: Kenichi Handa <handa@m17n.org>
Date: Thu, 15 Dec 2011 07:51:01 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.93~166
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/6080e055498c19ebd34495f204a8ad676eb09260?hp=bbd240ceeefcf4181aa9205f4e743b32b5c68e1f

merge trunk
---

diff --git a/leim/ChangeLog b/leim/ChangeLog
index 11aae483ba..95a3671bdd 100644
--- 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 7e108a71a6..569d6e6b24 100644
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -39,7 +39,7 @@
  "ethiopic" "Ethiopic"
  '("$(3$Q#U!.(B "
    (ethio-prefer-ascii-space "_" "$(3$h(B")
-   (ethio-prefer-ascii-punctuation "." "$(3$i(B"))
+   "$(3$i(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 cb412197f3..e718222e01 100644
--- 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 306a7bee9d..3c39b1eff9 100644
--- 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