[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110927: Fix bug #12927 with scrolling under hl-line-mode and scroll-conservatively.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110927
fixes bug: http://debbugs.gnu.org/12927
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-11-20 19:44:04 +0200
message:
  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.
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-20 09:29:47 +0000
+++ b/lisp/ChangeLog    2012-11-20 17:44:04 +0000
@@ -1,3 +1,8 @@
+2012-11-20  Eli Zaretskii  <address@hidden>
+
+       * simple.el (line-move): Don't call line-move-partial if
+       scroll-conservatively is in effect.  (Bug#12927)
+
 2012-11-20  Michael Albinus  <address@hidden>
 
        * net/trampver.el (tramp-version): Downgrade to 2.2.6-24.3, in

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2012-10-07 22:31:58 +0000
+++ b/lisp/simple.el    2012-11-20 17:44:04 +0000
@@ -4583,6 +4583,9 @@
     (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)