[Emacs-diffs] /srv/bzr/emacs/trunk r105019: Merge from emacs-23 branch

[Chong Yidong]

------------------------------------------------------------
revno: 105019 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2011-07-07 12:18:48 -0400
message:
  Merge from emacs-23 branch
modified:
  src/ChangeLog
  src/composite.c
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-07 15:39:23 +0000
+++ b/src/ChangeLog     2011-07-07 16:18:25 +0000
@@ -1,3 +1,10 @@
+2011-07-07  Kenichi Handa  <address@hidden>
+
+       * composite.c (composition_compute_stop_pos): Ignore a static
+       composition starting before CHARPOS (Bug#8915).
+
+       * xdisp.c (handle_composition_prop): Likewise.
+
 2011-07-07  Eli Zaretskii  <address@hidden>
 
        * term.c (produce_glyphs) <xassert>: Allow IT_GLYPHLESS in it->what.

=== modified file 'src/composite.c'
--- a/src/composite.c   2011-07-06 23:28:00 +0000
+++ b/src/composite.c   2011-07-07 16:18:25 +0000
@@ -1026,6 +1026,7 @@
   /* FIXME: Bidi is not yet handled well in static composition.  */
   if (charpos < endpos
       && find_composition (charpos, endpos, &start, &end, &prop, string)
+      && start >= charpos
       && COMPOSITION_VALID_P (start, end, prop))
     {
       cmp_it->stop_pos = endpos = start;

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-06-24 21:25:22 +0000
+++ b/src/xdisp.c       2011-07-07 16:18:25 +0000
@@ -4583,6 +4583,11 @@
       && COMPOSITION_VALID_P (start, end, prop)
       && (STRINGP (it->string) || (PT <= start || PT >= end)))
     {
+      if (start < pos)
+       /* As we can't handle this situation (perhaps font-lock added
+          a new composition), we just return here hoping that next
+          redisplay will detect this composition much earlier.  */
+       return HANDLED_NORMALLY;
       if (start != pos)
        {
          if (STRINGP (it->string))