- start_on_image_or_stretch_or_string_p = (it.method == GET_FROM_IMAGE
- || it.method == GET_FROM_STRETCH
- || it.method == GET_FROM_STRING);
+
+ /* We expect the call to move_it_to, further down, to overshoot
+ if the starting point is on an image, stretch glyph, or Lisp
+ string. We won't need to backtrack in this situation, except
+ for one corner case: when the Lisp string contains a
+ newline. */
+ if (it.method == GET_FROM_STRING)
+ {
+ const char *s = SDATA (it.string);
+ const char *e = s + SBYTES (it.string);
+
+ while (s < e && *s != '\n')
+ ++s;
+
+ it_overshoot_expected_p = (s == e);
+ }
+ else
+ it_overshoot_expected_p = (it.method == GET_FROM_IMAGE
+ || it.method == GET_FROM_STRETCH);
+