From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 28 May 2016 15:33:50 +0000 (+0300)
Subject: Fix 'next-line' and 'previous-line' during keyboard macro
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/4ef0fc192b8a10625053dbb9376c814e68612eb6

Fix 'next-line' and 'previous-line' during keyboard macro

* lisp/simple.el (line-move-visual): Handle the case when point
moves outside of the visible portion of the buffer while executing
a keyboard macro.  (Bug#13452)  (Bug#23551)  (Bug#23555)
---

diff --git a/lisp/simple.el b/lisp/simple.el
index affc403dcd..3d25ec19ab 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