# HG changeset patch
# User Kenichi Handa <handa@etlken>
# Date 1261980566 -32400
# Node ID 7b44231693569e7b4b9a3597aff9d0da5f5263fa
# Parent  5920a711085633fdd7f39dbd1bddd56c7071c9d6
*** empty log message ***

diff -r 5920a7110856 -r 7b4423169356 src/ChangeLog
--- a/src/ChangeLog	Mon Dec 28 03:13:43 2009 +0100
+++ b/src/ChangeLog	Mon Dec 28 15:09:26 2009 +0900
@@ -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