aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2010-05-26 10:14:51 +0900
committerKenichi Handa2010-05-26 10:14:51 +0900
commitb705058384311a5b4d059d7c71de2e8984802ca6 (patch)
tree589cff8c2ed0f7c7f5c749ee12ec5e42699eaab7 /src
parentbef4957b87f4fb9bd013114ec94d6a3845ddb4df (diff)
downloademacs-b705058384311a5b4d059d7c71de2e8984802ca6.tar.gz
emacs-b705058384311a5b4d059d7c71de2e8984802ca6.zip
Fix for finding a static composition.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/composite.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 56879fff87c..d451e873adb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-05-26 Kenichi Handa <handa@m17n.org>
2
3 * composite.c (composition_compute_stop_pos): Fix condition for
4 backward scanning.
5
12010-05-25 Glenn Morris <rgm@gnu.org> 62010-05-25 Glenn Morris <rgm@gnu.org>
2 7
3 * Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): 8 * Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
diff --git a/src/composite.c b/src/composite.c
index dd07ab8f9a2..8a549f4796d 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1124,7 +1124,7 @@ composition_compute_stop_pos (cmp_it, charpos, bytepos, endpos, string)
1124 } 1124 }
1125 } 1125 }
1126 } 1126 }
1127 else 1127 else if (charpos > endpos)
1128 { 1128 {
1129 /* Search backward for a pattern that may be composed and the 1129 /* Search backward for a pattern that may be composed and the
1130 position of (possibly) the last character of the match is 1130 position of (possibly) the last character of the match is