From: Kenichi Handa <handa@m17n.org>
Date: Fri, 7 Jul 2006 01:07:53 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.0.90~8295^2~827
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f91e681f7d395c0221150b60b36a899c1588e949;p=emacs.git

*** empty log message ***
---

diff --git a/etc/ChangeLog.unicode b/etc/ChangeLog.unicode
index 45987ab29ed..cbb310093e7 100644
--- a/etc/ChangeLog.unicode
+++ b/etc/ChangeLog.unicode
@@ -1,3 +1,7 @@
+2006-07-07  Kenichi Handa  <handa@m17n.org>
+
+	* HELLO: Sync with HEAD.
+
 2005-02-12  Miles Bader  <miles@gnu.org>
 
 	* TODO, PROBLEMS, NEWS: Replace references to Emacs version "22"
diff --git a/lisp/ChangeLog.unicode b/lisp/ChangeLog.unicode
index 714aafe7291..69f35444369 100644
--- a/lisp/ChangeLog.unicode
+++ b/lisp/ChangeLog.unicode
@@ -1,3 +1,14 @@
+2006-07-07  Kenichi Handa  <handa@m17n.org>
+
+	* international/mule-cmds.el (set-language-info): Fix synching
+	with HEAD.
+	(set-language-environment): Likewise.
+	(standard-display-european-internal): Sync with HEAD.
+	(set-language-environment-nonascii-translation): Fix synching with
+	HEAD.
+	(set-language-environment-fontset): Delete it.
+	(set-language-environment-unibyte): Fix synching with HEAD.
+
 2006-07-03  Kenichi Handa  <handa@m17n.org>
 
 	* international/fontset.el (otf-script-alist): Set it.
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 7e34fb10b9f..fc94123dd13 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,3 +1,7 @@
+2006-07-07  Kenichi Handa  <handa@m17n.org>
+
+	* ftfont.c (ftfont_list): Fix typo.
+
 2006-07-05  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* ftfont.c (ftfont_list): Move misplaced #endif