From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 20 Nov 2012 17:44:04 +0000 (+0200)
Subject: Fix bug #12927 with scrolling under hl-line-mode and scroll-conservatively.
X-Git-Tag: emacs-24.2.90~25
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7cf95797aff43cb59fec03905a8937d41e68ada1;p=emacs.git

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 247222bde21..225f296e135 100644
--- 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 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)