Fix vertical-motion in truncated lines that end in a stretch

* src/indent.c (Fvertical_motion): Expect overshoot when point is
beyond window margin and lines are truncated, even if we have a
stretch at point.  (Bug#21468)

diff --git a/src/indent.c b/src/indent.c
index 584f2179bc5ce1c0fcb78aa2997858b163606168..330065b085ef1ac42c7d43ed426a4e9653a6180a 100644 (file)
--- a/src/indent.c
+++ b/src/indent.c
@@ -2082,7 +2082,11 @@ whether or not it is currently displayed in some window.  */)
        }
       else
        it_overshoot_count =
-         !(it.method == GET_FROM_IMAGE || it.method == GET_FROM_STRETCH);
+         (!(it.method == GET_FROM_IMAGE
+            || it.method == GET_FROM_STRETCH)
+           /* We will overshoot if lines are truncated and PT lies
+              beyond the right margin of the window.  */
+           || it.line_wrap == TRUNCATE);
 
       if (start_x_given)
        {