Fix bug #12927 with scrolling under hl-line-mode and scroll-conservatively.

 lisp/simple.el (line-move): Don't call line-move-partial if
 scroll-conservatively is in effect.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 247222bde2100fbc96fd3be720878c875d3ffcfa..225f296e1357a0c93114433ad20e6a49ea93eeb2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * simple.el (line-move): Don't call line-move-partial if
+       scroll-conservatively is in effect.  (Bug#12927)
+
 2012-11-20  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/trampver.el (tramp-version): Downgrade to 2.2.6-24.3, in

diff --git a/lisp/simple.el b/lisp/simple.el
index aed945d6e133eb8bd53dc241aa108801f5c2cac3..5867561da267d9a5aa0ebfa582dbdc57bdabfd89 100644 (file)
--- 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)