Mercurial > emacs
changeset 64282:769e8d799acf
(Fvertical_motion): If start position is on an image,
don't move back if we move too far (that's almost certain to happen).
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Wed, 13 Jul 2005 10:02:58 +0000 |
| parents | 6d94773592af |
| children | d57ad48e7901 |
| files | src/indent.c |
| diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/indent.c Wed Jul 13 10:02:42 2005 +0000 +++ b/src/indent.c Wed Jul 13 10:02:58 2005 +0000 @@ -2074,6 +2074,7 @@ { int it_start; int oselective; + int start_on_image_p; SET_TEXT_POS (pt, PT, PT_BYTE); start_display (&it, w, pt); @@ -2085,6 +2086,7 @@ while the end position is really at some X > 0, the same X that PT had. */ it_start = IT_CHARPOS (it); + start_on_image_p = (it.method == GET_FROM_IMAGE); reseat_at_previous_visible_line_start (&it); it.current_x = it.hpos = 0; /* Temporarily disable selective display so we don't move too far */ @@ -2094,8 +2096,10 @@ it.selective = oselective; /* Move back if we got too far. This may happen if - truncate-lines is on and PT is beyond right margin. */ - if (IT_CHARPOS (it) > it_start && XINT (lines) > 0) + truncate-lines is on and PT is beyond right margin. + It may also happen if it_start is on an image -- + in that case, don't go back. */ + if (IT_CHARPOS (it) > it_start && XINT (lines) > 0 && !start_on_image_p) move_it_by_lines (&it, -1, 0); it.vpos = 0;