*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a04f0a84d6a32994b98013d5f134563113b8ff36..10b8c8297a1958987215e4a6e662cf2675a5b4de 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2000-01-05  Kenichi Handa  <handa@etl.go.jp>
+
+       * composite.el (compose-last-chars): New argument COMPONENTS.  It
+       it is non-nil, compose preceding characters by compose-region with
+       COMPONENTS.
+
+       * international/quail.el (quail-input-string-to-events): New function.
+       (quail-input-method): Convert input string to events here.
+       (quail-start-translation): Return input string, not event list.
+       (quail-start-conversion): Likewise.
+
 2001-01-04  Gerd Moellmann  <gerd@gnu.org>
 
        * tooltip.el (tooltip-cancel-delayed-tip)