[Emacs-diffs] /srv/bzr/emacs/trunk r101190: xdisp.c (compute_stop_pos): Pay attention to bidi scan direction on calling composition_compute_stop_pos.

[Kenichi Handa]

------------------------------------------------------------
revno: 101190 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Thu 2010-08-26 09:51:37 +0900
message:
  xdisp.c (compute_stop_pos): Pay attention to bidi scan direction on calling 
composition_compute_stop_pos.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-25 05:58:15 +0000
+++ b/src/ChangeLog     2010-08-26 00:47:34 +0000
@@ -1,3 +1,8 @@
+2010-08-26  Kenichi Handa  <address@hidden>
+
+       * xdisp.c (compute_stop_pos): Pay attention to bidi scan direction
+       on calling composition_compute_stop_pos.
+
 2010-08-25  Kenichi Handa  <address@hidden>
 
        * fontset.c (reorder_font_vector): Prefer a font-spec specifying

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-08-21 13:25:03 +0000
+++ b/src/xdisp.c       2010-08-26 00:47:34 +0000
@@ -3177,7 +3177,7 @@
 {
   register INTERVAL iv, next_iv;
   Lisp_Object object, limit, position;
-  EMACS_INT charpos, bytepos;
+  EMACS_INT charpos, bytepos, stoppos;
 
   /* If nowhere else, stop at the end.  */
   it->stop_charpos = it->end_charpos;
@@ -3267,8 +3267,12 @@
        }
     }
 
+  if (it->bidi_p && it->bidi_it.scan_dir < 0)
+    stoppos = -1;
+  else
+    stoppos = it->stop_charpos;
   composition_compute_stop_pos (&it->cmp_it, charpos, bytepos,
-                               it->stop_charpos, it->string);
+                               stoppos, it->string);
 
   xassert (STRINGP (it->string)
           || (it->stop_charpos >= BEGV