aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2011-05-20 09:51:38 +0900
committerKenichi Handa2011-05-20 09:51:38 +0900
commit31bfc35cca6df0d14f4786a9890f3a01b91cfc4c (patch)
tree680b0cceba154f21995668d20ce31900ffc41cc5 /src
parent23373930daa192623bfda56960ccb04b2703fbe5 (diff)
downloademacs-31bfc35cca6df0d14f4786a9890f3a01b91cfc4c.tar.gz
emacs-31bfc35cca6df0d14f4786a9890f3a01b91cfc4c.zip
composite.c (find_automatic_composition): Fix previous change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/composite.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 372bf383fb8..79e5bf677f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-05-20 handa <handa@m17n.org>
2
3 * composite.c (find_automatic_composition): Fix previous change.
4
12011-05-18 Kenichi Handa <handa@m17n.org> 52011-05-18 Kenichi Handa <handa@m17n.org>
2 6
3 * composite.c (CHAR_COMPOSABLE_P): Add more check for efficiency. 7 * composite.c (CHAR_COMPOSABLE_P): Add more check for efficiency.
diff --git a/src/composite.c b/src/composite.c
index 8f8878e46a9..7849ffa3a18 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1565,7 +1565,7 @@ find_automatic_composition (EMACS_INT pos, EMACS_INT limit,
1565 if (limit <= pos) /* case (1) */ 1565 if (limit <= pos) /* case (1) */
1566 { 1566 {
1567 do { 1567 do {
1568 if (cur.pos == limit) 1568 if (cur.pos <= limit)
1569 return 0; 1569 return 0;
1570 BACKWARD_CHAR (cur, stop); 1570 BACKWARD_CHAR (cur, stop);
1571 c = STRING_CHAR (cur.p); 1571 c = STRING_CHAR (cur.p);