aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorKenichi Handa2010-08-25 15:15:12 +0900
committerKenichi Handa2010-08-25 15:15:12 +0900
commit38cc06d9c47e11c8cddfa39c3e09c18bc33071f3 (patch)
treeef1941fcb685e93f2591def428496b436fe67617 /src/ChangeLog
parent4e603db3429957e6b26953c177f00a9c9d1c8766 (diff)
parent9bbaf4b01d0c95215fca22d2808ed0dd5466cae1 (diff)
downloademacs-38cc06d9c47e11c8cddfa39c3e09c18bc33071f3.tar.gz
emacs-38cc06d9c47e11c8cddfa39c3e09c18bc33071f3.zip
merge trunk
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5ce4c049c77..39f168dc8a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12010-08-25 Kenichi Handa <handa@m17n.org> 12010-08-25 Kenichi Handa <handa@m17n.org>
2 2
3 * fontset.c (reorder_font_vector): Prefer a font-spec specifying
4 :otf.
5
3 * composite.c (composition_compute_stop_pos): Don't break 6 * composite.c (composition_compute_stop_pos): Don't break
4 composition at PT. 7 composition at PT.
5 (composition_reseat_it): Likewise. Fix calculation of character 8 (composition_reseat_it): Likewise. Fix calculation of character