1 files changed, 3 insertions, 0 deletions

diff --git a/lisp/simple.el b/lisp/simple.el
index aed945d6e13..5867561da26 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4583,6 +4583,9 @@ lines."
     (unless (and auto-window-vscroll try-vscroll
                  ;; Only vscroll for single line moves
                  (= (abs arg) 1)
+                 ;; Under scroll-conservatively, the display engine
+                 ;; does this better.
+                 (zerop scroll-conservatively)
                  ;; But don't vscroll in a keyboard macro.
                  (not defining-kbd-macro)
                  (not executing-kbd-macro)