diff options
| author | Eli Zaretskii | 2011-09-07 21:14:26 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-09-07 21:14:26 +0300 |
| commit | e08dcafd836bbb948a4313b94bb7a1819cfbafa3 (patch) | |
| tree | 886afd3e695094f03c1c9b4258fda94168a36b87 /src | |
| parent | 115b96bdb5e17c69bafabc82f43cfbfe3eecc115 (diff) | |
| download | emacs-e08dcafd836bbb948a4313b94bb7a1819cfbafa3.tar.gz emacs-e08dcafd836bbb948a4313b94bb7a1819cfbafa3.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 293107f6ffb..44b8e168031 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-09-07 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (move_it_in_display_line_to): Call RESTORE_IT on ppos_it | ||
| 4 | only under bidi iteration. | ||
| 5 | |||
| 1 | 2011-09-07 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2011-09-07 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * gtkutil.c (xg_make_tool_item): Insert comment about eventbox. | 8 | * 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, | |||
| 8116 | && !saw_smaller_pos | 8116 | && !saw_smaller_pos |
| 8117 | && IT_CHARPOS (*it) > to_charpos)) | 8117 | && IT_CHARPOS (*it) > to_charpos)) |
| 8118 | { | 8118 | { |
| 8119 | if (!at_eob_p && IT_CHARPOS (ppos_it) < ZV) | 8119 | if (it->bidi_p |
| 8120 | && !at_eob_p && IT_CHARPOS (ppos_it) < ZV) | ||
| 8120 | RESTORE_IT (it, &ppos_it, ppos_data); | 8121 | RESTORE_IT (it, &ppos_it, ppos_data); |
| 8121 | result = MOVE_POS_MATCH_OR_ZV; | 8122 | result = MOVE_POS_MATCH_OR_ZV; |
| 8122 | break; | 8123 | break; |