[Emacs-diffs] Changes to emacs/src/composite.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/09/10 01:36:19

Index: composite.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/composite.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- composite.c 9 Sep 2008 11:07:49 -0000       1.57
+++ composite.c 10 Sep 2008 01:36:19 -0000      1.58
@@ -1000,6 +1000,7 @@
   if (endpos > charpos + MAX_NEWLINE_DISTANCE)
     endpos = charpos + MAX_NEWLINE_DISTANCE;
   cmp_it->stop_pos = endpos;
+  cmp_it->ch = -2;
   if (find_composition (charpos, endpos, &start, &end, &prop, string)
       && COMPOSITION_VALID_P (start, end, prop))
     {
@@ -1043,15 +1044,12 @@
              cmp_it->lookback = XFASTINT (AREF (elt, 1));
              cmp_it->stop_pos = charpos - 1 - cmp_it->lookback;
              cmp_it->ch = c;
-             break;
+             return;
            }
        }
     }
-  if (charpos == endpos)
-    {
-      cmp_it->stop_pos = endpos;
+  cmp_it->stop_pos = charpos;
       cmp_it->ch = -2;
-    }
 }
 
 /* Check if the character at CHARPOS (and BYTEPOS) is composed