2 files changed, 22 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d54f5f08dd..473e539f0da 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -16,6 +16,13 @@
         * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the
         switches.  Check also for //SUBDIRED// line.
 
+2009-12-25  Kenichi Handa  <handa@m17n.org>
+
+        * language/indian.el (devanagari-composable-pattern): Fixed to
+        handle ZWNJ and ZWJ.  Use it in composition-function-table for
+        Devanagari.
+        (malayalam-composable-pattern): Fix previous change.
+
 2009-12-23  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
         * ps-print.el (ps-face-attributes): It was not returning the
diff --git a/src/ChangeLog b/src/ChangeLog
index e43758177d8..02034e61d49 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,21 @@
         cmp.from and cmp.to as well.
         (pitx) Fix last change.
 
+2009-12-25  Kenichi Handa  <handa@m17n.org>
+
+        * composite.h (composition_adjust_point): Update prototype.
+
+        * composite.c (composition_reseat_it): Don't make a composition
+        spanning over point.
+        (CHAR_COMPOSABLE_P): Treat U+200C (ZWNJ) and U+200D (ZWJ) as
+        composable characters.
+        (composition_adjust_point): New arg NEW_PT.  Callers changed.
+
+        * keyboard.c (command_loop_1): Force redisplay if the last point
+        was within a composition.
+        (adjust_point_for_property): Don't adjust point for automatic
+        composition when called after buffer modification.
+
 2009-12-19  Eli Zaretskii  <eliz@gnu.org>
 
         * .gdbinit (pitx): Don't use enum names, use their values.  Remove