[Emacs-diffs] /srv/bzr/emacs/trunk r105819: src/xdisp.c (reseat_at_next_visible_line_start): Fix last change.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105819
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-18 18:16:47 +0300
message:
  src/xdisp.c (reseat_at_next_visible_line_start): Fix last change.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-18 09:01:39 +0000
+++ b/src/ChangeLog     2011-09-18 15:16:47 +0000
@@ -1,3 +1,7 @@
+2011-09-18  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (reseat_at_next_visible_line_start): Fix last change.
+
 2011-09-18  Paul Eggert  <address@hidden>
 
        Fix minor problem found by static checking.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-09-18 09:01:39 +0000
+++ b/src/xdisp.c       2011-09-18 15:16:47 +0000
@@ -5812,7 +5812,7 @@
   else if (skipped_p)
     {
       reseat (it, it->current.pos, 0);
-      if (it->bidi_p)
+      if (it->bidi_p && !STRINGP (it->string))
        {
          it->bidi_it.new_paragraph = new_paragraph;
          it->bidi_it.first_elt = first_elt;