1 files changed, 4 insertions, 1 deletions

diff --git a/src/indent.c b/src/indent.c
index 4d4f4b4b0ca..639cfdae818 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1121,7 +1121,10 @@ compute_motion (from, fromvpos, fromhpos, did_motion, to, tovpos, tohpos, width,
           newpos = skip_invisible (pos, &next_boundary, to, window);
 
           if (newpos >= to)
-            goto after_loop;
+            {
+              pos = min (to, newpos);
+              goto after_loop;
+            }
 
           if (newpos != pos_here)
             {