# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1140522432 0
# Node ID 339a4ce9077499312644697010d28083e74aa9e6
# Parent  716899c4597455c50088456dc83d6d949d7bedf3
*** empty log message ***

diff -r 716899c45974 -r 339a4ce90774 lisp/ChangeLog.unicode
--- a/lisp/ChangeLog.unicode	Tue Feb 21 11:47:02 2006 +0000
+++ b/lisp/ChangeLog.unicode	Tue Feb 21 11:47:12 2006 +0000
@@ -1,3 +1,13 @@
+2006-02-21  Kenichi Handa  <handa@m17n.org>
+
+	* startup.el (command-line): Use custom-reevaluate-setting for
+	global-auto-composition-mode.
+
+	* composite.el (auto-composition-function): Make it buffer local.
+	(auto-composition-mode): New minor mode.
+	(turn-on-auto-composition-if-enabled): New function.
+	(global-auto-composition-mode): New global minor mode.
+
 2006-01-24  Kenichi Handa  <handa@m17n.org>
 
 	* descr-text.el (describe-char): Use insert-text-button instead of