Commit e2de7999 authored by Kim F. Storm's avatar Kim F. Storm
Browse files

From: Kyotaro HORIGUCHI (tiny change)

(Fvertical_motion): Force move if starting on stretch glyph.
parent 55920229
......@@ -2074,7 +2074,7 @@ whether or not it is currently displayed in some window. */)
{
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 @@ whether or not it is currently displayed in some window. */)
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 @@ whether or not it is currently displayed in some window. */)
/* 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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment