1 files changed, 5 insertions, 1 deletions

diff --git a/lisp/simple.el b/lisp/simple.el
index 47c9cd30c17..dfd92dcdc05 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6000,7 +6000,11 @@ and `current-column' to be able to ignore invisible text."
         ;; that will get us to the same place on the screen
         ;; but with a more reasonable buffer position.
         (goto-char normal-location)
-        (let ((line-beg (line-beginning-position)))
+        (let ((line-beg
+               ;; We want the real line beginning, so it's consistent
+               ;; with bolp below, otherwise we might infloop.
+               (let ((inhibit-field-text-motion t))
+                 (line-beginning-position))))
           (while (and (not (bolp)) (invisible-p (1- (point))))
             (goto-char (previous-char-property-change (point) line-beg))))))))