[Emacs-diffs] emacs-24 r117536: Fix bug #18584 with assertion violations while scrolling.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117536
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18584
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-10-02 17:57:05 +0300
message:
  Fix bug #18584 with assertion violations while scrolling.
  
   src/xdisp.c (move_it_by_lines): Call reseat_1 after moving the
   iterator backwards, to resync the bidi iterator.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-10-02 00:26:16 +0000
+++ b/src/ChangeLog     2014-10-02 14:57:05 +0000
@@ -1,3 +1,8 @@
+2014-10-02  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (move_it_by_lines): Call reseat_1 after moving the
+       iterator backwards, to resync the bidi iterator.  (Bug#18584)
+
 2014-10-01  Jan Djärv  <address@hidden>
 
        * xfaces.c (Finternal_set_lisp_face_attribute): Don't try to

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-09-30 05:02:13 +0000
+++ b/src/xdisp.c       2014-10-02 14:57:05 +0000
@@ -9748,6 +9748,7 @@
              back_to_previous_visible_line_start (it);
              it->vpos--;
            }
+         reseat_1 (it, it->current.pos, 1);
        }
       else
        RESTORE_IT (it, it, it2data);