[Emacs-diffs] /srv/bzr/emacs/trunk r99336: xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS. Callers changed.

[Kenichi Handa]

------------------------------------------------------------
revno: 99336 [merge]
committer: Kenichi Handa  <address@hidden>
branch nick: trunk
timestamp: Fri 2010-01-15 14:14:00 +0900
message:
  xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS.  Callers changed.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-15 01:46:53 +0000
+++ b/src/ChangeLog     2010-01-15 05:13:05 +0000
@@ -1,3 +1,7 @@
+2010-01-15  Kenichi Handa  <address@hidden>
+
+       * xdisp.c (CHAR_COMPOSED_P): New arg END_CHARPOS.  Callers changed.
+
 2010-01-15  Chong Yidong  <address@hidden>
 
        * nsterm.m (Qnone): Define.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-01-13 08:35:10 +0000
+++ b/src/xdisp.c       2010-01-15 05:09:50 +0000
@@ -5638,11 +5638,11 @@
 /* Return 1 iff a character at CHARPOS (and BYTEPOS) is composed
    (possibly with the following characters).  */
 
-#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS)                            \
+#define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS,END_CHARPOS)                        
\
   ((IT)->cmp_it.id >= 0                                                        
\
    || ((IT)->cmp_it.stop_pos == (CHARPOS)                              \
        && composition_reseat_it (&(IT)->cmp_it, CHARPOS, BYTEPOS,      \
-                                (IT)->end_charpos, (IT)->w,            \
+                                END_CHARPOS, (IT)->w,                  \
                                 FACE_FROM_ID ((IT)->f, (IT)->face_id), \
                                 (IT)->string)))
 
@@ -6300,7 +6300,7 @@
          return 0;
        }
       else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it),
-                               IT_STRING_BYTEPOS (*it))
+                               IT_STRING_BYTEPOS (*it), SCHARS (it->string))
               && next_element_from_composition (it))
        {
          return 1;
@@ -6336,7 +6336,7 @@
          CHARPOS (position) = BYTEPOS (position) = -1;
        }
       else if (CHAR_COMPOSED_P (it, IT_STRING_CHARPOS (*it),
-                               IT_STRING_BYTEPOS (*it))
+                               IT_STRING_BYTEPOS (*it), it->string_nchars)
               && next_element_from_composition (it))
        {
          return 1;
@@ -6523,7 +6523,8 @@
          && IT_CHARPOS (*it) >= it->redisplay_end_trigger_charpos)
        run_redisplay_end_trigger_hook (it);
 
-      if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it))
+      if (CHAR_COMPOSED_P (it, IT_CHARPOS (*it), IT_BYTEPOS (*it),
+                          it->end_charpos)
          && next_element_from_composition (it))
        {
          return 1;