From: Kenichi Handa <handa@etlken>
Date: Wed, 26 May 2010 01:14:51 +0000 (+0900)
Subject: Fix for finding a static composition.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~186
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b705058384311a5b4d059d7c71de2e8984802ca6;p=emacs.git

Fix for finding a static composition.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 56879fff87c..d451e873adb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-26  Kenichi Handa  <handa@m17n.org>
+
+	* composite.c (composition_compute_stop_pos): Fix condition for
+	backward scanning.
+
 2010-05-25  Glenn Morris  <rgm@gnu.org>
 
 	* 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)
 	    }
 	}
     }
-  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