Fix a crash in vertical-motion.

 src/xdisp.c (move_it_in_display_line_to): Call RESTORE_IT on ppos_it
 only under bidi iteration.

diff --git a/build-aux/move-if-change b/build-aux/move-if-change
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/ChangeLog b/src/ChangeLog
index 293107f6ffb281a6dd8d4cfc41f387311ee3422f..44b8e168031142d0a6e26f6c4c6825216d2d147c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-07  Eli Zaretskii  <eliz@gnu.org>
+
+       * xdisp.c (move_it_in_display_line_to): Call RESTORE_IT on ppos_it
+       only under bidi iteration.
+
 2011-09-07  Jan Djärv  <jan.h.d@swipnet.se>
 
        * gtkutil.c (xg_make_tool_item): Insert comment about eventbox.

diff --git a/src/xdisp.c b/src/xdisp.c
index f11362c1ae6d3b6e2e4a13b5505934b97f5f2b85..d4b147938439186e10d67cacba9277d1210986b3 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8116,7 +8116,8 @@ move_it_in_display_line_to (struct it *it,
                      && !saw_smaller_pos
                      && IT_CHARPOS (*it) > to_charpos))
                {
-                 if (!at_eob_p && IT_CHARPOS (ppos_it) < ZV)
+                 if (it->bidi_p
+                     && !at_eob_p && IT_CHARPOS (ppos_it) < ZV)
                    RESTORE_IT (it, &ppos_it, ppos_data);
                  result = MOVE_POS_MATCH_OR_ZV;
                  break;