From: Eli Zaretskii Date: Wed, 7 Sep 2011 18:14:26 +0000 (+0300) Subject: Fix a crash in vertical-motion. X-Git-Tag: emacs-pretest-24.0.90~104^2~137 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e08dcafd836bbb948a4313b94bb7a1819cfbafa3;p=emacs.git 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 new mode 100644 diff --git a/src/ChangeLog b/src/ChangeLog index 293107f6ffb..44b8e168031 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-09-07 Eli Zaretskii + + * xdisp.c (move_it_in_display_line_to): Call RESTORE_IT on ppos_it + only under bidi iteration. + 2011-09-07 Jan Djärv * gtkutil.c (xg_make_tool_item): Insert comment about eventbox. diff --git a/src/xdisp.c b/src/xdisp.c index f11362c1ae6..d4b14793843 100644 --- 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;