[Emacs-diffs] /srv/bzr/emacs/trunk r105424: Improve on previous change in xdisp.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105424
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2011-08-08 20:37:34 +0300
message:
  Improve on previous change in xdisp.c.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-08 16:57:53 +0000
+++ b/src/ChangeLog     2011-08-08 17:37:34 +0000
@@ -1,7 +1,9 @@
 2011-08-08  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (forward_to_next_line_start): Allow to use the
-       no-display-properties-and-no-overlays under bidi display.
+       no-display-properties-and-no-overlays under bidi display.  Set
+       disp_pos in the bidi iterator to avoid searches for display
+       properties and overlays.
 
 2011-08-08  Chong Yidong  <address@hidden>
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-08-08 16:57:53 +0000
+++ b/src/xdisp.c       2011-08-08 17:37:34 +0000
@@ -5551,6 +5551,14 @@
            {
              struct bidi_it bprev;
 
+             /* Help bidi.c avoid expensive searches for display
+                properties and overlays, by telling it that there are
+                none up to `limit'.  */
+             if (it->bidi_it.disp_pos < limit)
+               {
+                 it->bidi_it.disp_pos = limit;
+                 it->bidi_it.disp_prop_p = 0;
+               }
              do {
                bprev = it->bidi_it;
                bidi_move_to_visually_next (&it->bidi_it);