[Emacs-diffs] /srv/bzr/emacs/trunk r100443: Fix for finding a static composition.

[Kenichi Handa]

------------------------------------------------------------
revno: 100443 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Wed 2010-05-26 10:16:07 +0900
message:
  Fix for finding a static composition.
modified:
  src/ChangeLog
  src/composite.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-25 04:25:15 +0000
+++ b/src/ChangeLog     2010-05-26 01:14:51 +0000
@@ -1,3 +1,8 @@
+2010-05-26  Kenichi Handa  <address@hidden>
+
+       * composite.c (composition_compute_stop_pos): Fix condition for
+       backward scanning.
+
 2010-05-25  Glenn Morris  <address@hidden>
 
        * Makefile.in (@NS_IMPL_GNUSTEP_INC@, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):

=== modified file 'src/composite.c'
--- a/src/composite.c   2010-05-25 00:32:24 +0000
+++ b/src/composite.c   2010-05-26 01:14:51 +0000
@@ -1124,7 +1124,7 @@
            }
        }
     }
-  else
+  else if (charpos > endpos)
     {
       /* Search backward for a pattern that may be composed and the
         position of (possibly) the last character of the match is