Mercurial > emacs
changeset 67421:a405a1787bef
From: Kyotaro HORIGUCHI (tiny change)
(Fvertical_motion): Force move if starting on stretch glyph.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Fri, 09 Dec 2005 09:35:21 +0000 |
| parents | 122aaab8f70e |
| children | f1c2c0059ca7 |
| files | src/indent.c |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/indent.c Fri Dec 09 09:10:10 2005 +0000 +++ b/src/indent.c Fri Dec 09 09:35:21 2005 +0000 @@ -2074,7 +2074,7 @@ { int it_start; int oselective; - int start_on_image_p; + int start_on_image_or_stretch_p; SET_TEXT_POS (pt, PT, PT_BYTE); start_display (&it, w, pt); @@ -2086,7 +2086,8 @@ 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); + start_on_image_or_stretch_p = (it.method == GET_FROM_IMAGE + || it.method == GET_FROM_STRETCH); reseat_at_previous_visible_line_start (&it); it.current_x = it.hpos = 0; /* Temporarily disable selective display so we don't move too far */ @@ -2097,9 +2098,10 @@ /* Move back if we got too far. This may happen if 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) + It may also happen if it_start is on an image or a stretch + glyph -- in that case, don't go back. */ + if (IT_CHARPOS (it) > it_start && XINT (lines) > 0 + && !start_on_image_or_stretch_p) move_it_by_lines (&it, -1, 0); it.vpos = 0;