Commit cec726f6 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(Fvertical_motion): Include composition in the case of

overshoot expected.
parent b07e0143
...@@ -2088,10 +2088,10 @@ whether or not it is currently displayed in some window. */) ...@@ -2088,10 +2088,10 @@ whether or not it is currently displayed in some window. */)
it_start = IT_CHARPOS (it); it_start = IT_CHARPOS (it);
/* We expect the call to move_it_to, further down, to overshoot /* We expect the call to move_it_to, further down, to overshoot
if the starting point is on an image, stretch glyph, or Lisp if the starting point is on an image, stretch glyph,
string. We won't need to backtrack in this situation, except composition, or Lisp string. We won't need to backtrack in
for one corner case: when the Lisp string contains a this situation, except for one corner case: when the Lisp
newline. */ string contains a newline. */
if (it.method == GET_FROM_STRING) if (it.method == GET_FROM_STRING)
{ {
const char *s = SDATA (it.string); const char *s = SDATA (it.string);
...@@ -2104,7 +2104,8 @@ whether or not it is currently displayed in some window. */) ...@@ -2104,7 +2104,8 @@ whether or not it is currently displayed in some window. */)
} }
else else
it_overshoot_expected_p = (it.method == GET_FROM_IMAGE it_overshoot_expected_p = (it.method == GET_FROM_IMAGE
|| it.method == GET_FROM_STRETCH); || it.method == GET_FROM_STRETCH
|| it.method == GET_FROM_COMPOSITION);
reseat_at_previous_visible_line_start (&it); reseat_at_previous_visible_line_start (&it);
it.current_x = it.hpos = 0; it.current_x = it.hpos = 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