From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 13 Mar 2019 19:55:39 +0000 (-0400)
Subject: * lisp/emacs-lisp/easy-mmode.el: Fix most obvious bug#34723
X-Git-Tag: emacs-27.0.90~3416
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7dda131ab02b36362ae63744db66413a9f1df58d;p=emacs.git

* 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.
---

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)