merge trunk

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index ddb2c272687b04cf1b734e82433ab87ee89cc40b..372bf383fb87598eb2291cf24a0dd94f9c874156 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-18  Kenichi Handa  <handa@m17n.org>
+
+       * composite.c (CHAR_COMPOSABLE_P): Add more check for efficiency.
+       (BACKWARD_CHAR): Wrap the arg STOP by parenthesis.
+       (find_automatic_composition): Mostly rewrite for efficiency.
+
 2011-05-18  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in: Update dependencies.