1 files changed, 5 insertions, 1 deletions

diff --git a/src/indent.c b/src/indent.c
index 584f2179bc5..330065b085e 100644
--- 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)
         {