1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/simple.el b/lisp/simple.el
index affc403dcdc..3d25ec19ab2 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6054,7 +6054,13 @@ If NOERROR, don't signal an error if we can't move that many lines."
           (setq temporary-goal-column
                 (cons (/ (float x-pos)
                          (frame-char-width))
-                      hscroll))))))
+                      hscroll)))
+         (executing-kbd-macro
+          ;; When we move beyond the first/last character visible in
+          ;; the window, posn-at-point will return nil, so we need to
+          ;; approximate the goal column as below.
+          (setq temporary-goal-column
+                (mod (current-column) (window-text-width)))))))
     (if target-hscroll
         (set-window-hscroll (selected-window) target-hscroll))
     ;; vertical-motion can move more than it was asked to if it moves