# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1214453839 0
# Node ID b3db7e68c460dab2bc3d4305977d4ef7fba1c2ff
# Parent  66839d3799feaff169640ecb67f34a68e94996be
*** empty log message ***

diff -r 66839d3799fe -r b3db7e68c460 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jun 26 04:16:09 2008 +0000
+++ b/lisp/ChangeLog	Thu Jun 26 04:17:19 2008 +0000
@@ -1,3 +1,13 @@
+2008-06-26  Kenichi Handa  <handa@m17n.org>
+
+	* composite.el (terminal-composition-base-character-p): New
+	funciton.
+	(terminal-composition-function): Use
+	terminal-composition-base-character-p.  Include the base character
+	in the composition.
+	(auto-compose-chars): Don't check font-object for terminal
+	display.
+
 2008-06-26  Glenn Morris  <rgm@gnu.org>
 
 	* calendar/calendar.el (calendar-date-echo-text): Doc fix.