From 7dda131ab02b36362ae63744db66413a9f1df58d Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 13 Mar 2019 15:55:39 -0400 Subject: [PATCH] * lisp/emacs-lisp/easy-mmode.el: Fix most obvious bug#34723 (easy-mmode-define-navigation): Don't scroll in the opposite direction of the movement. --- lisp/emacs-lisp/easy-mmode.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 0cb9a6fa122..8ac0a1d5938 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -628,6 +628,7 @@ BODY is executed after moving to the destination location." ,body (when was-narrowed (funcall #',narrowfun))))))) (unless name (setq name base-name)) + ;; FIXME: Move most of those functions's bodies to helper functions! `(progn (defun ,next-sym (&optional count) ,(format "Go to the next COUNT'th %s. @@ -649,7 +650,11 @@ Interactively, COUNT is the prefix numeric argument, and defaults to 1." name) `(re-search-forward ,re nil t 2))) (point-max)))) (unless (pos-visible-in-window-p endpt nil t) - (recenter '(0))))))) + (let ((ws (window-start))) + (recenter '(0)) + (if (< (window-start) ws) + ;; recenter scrolled in the wrong direction! + (set-window-start nil ws)))))))) ,@body)) (put ',next-sym 'definition-name ',base) (defun ,prev-sym (&optional count) -- 2.39.5