Fix up the cmds that scroll relative to cursor

Reverts commit bbe92d1 (Handle scroll margin in scroll-to-top/bottom
functions (re #618), 2016-03-31) which introduced a bug in
evil-scroll-bottom-line-to-top (due to recenter argument becoming
negative.) recenter itself has clamped to scroll_margin for at least 18
years now, so it is unclear why that commit was even necessary.

Also fixes the docstring for evil-scroll-top-line-to-bottom and avoids
scanning down from (point-min) to the line the point is already at.

1 files changed, 21 insertions, 28 deletions

diff --git a/evil-commands.el b/evil-commands.el
index 1cbbeff..0788e8d 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -1133,33 +1133,33 @@ If the scroll count is zero the command scrolls half the screen."
   :repeat nil
   :keep-visual t
   (interactive "<c>")
-  (evil-save-column
-    (let ((line (or count (line-number-at-pos (point)))))
+  (when count
+    (evil-save-column
       (goto-char (point-min))
-      (forward-line (1- line)))
-    (recenter (1- (max 1 scroll-margin)))))
+      (forward-line (1- count))))
+  (recenter 0))
 
 (evil-define-command evil-scroll-line-to-center (count)
   "Scroll line number COUNT (or the cursor line) to the center of the window."
   :repeat nil
   :keep-visual t
   (interactive "<c>")
-  (evil-save-column
-    (when count
+  (when count
+    (evil-save-column
       (goto-char (point-min))
-      (forward-line (1- count)))
-    (recenter nil)))
+      (forward-line (1- count))))
+  (recenter))
 
 (evil-define-command evil-scroll-line-to-bottom (count)
   "Scroll line number COUNT (or the cursor line) to the bottom of the window."
   :repeat nil
   :keep-visual t
   (interactive "<c>")
-  (evil-save-column
-    (let ((line (or count (line-number-at-pos (point)))))
+  (when count
+    (evil-save-column
       (goto-char (point-min))
-      (forward-line (1- line)))
-    (recenter (- (max 1 scroll-margin)))))
+      (forward-line (1- count))))
+  (recenter -1))
 
 (evil-define-command evil-scroll-bottom-line-to-top (count)
   "Scroll the line right below the window,
@@ -1167,28 +1167,21 @@ or line COUNT to the top of the window."
   :repeat nil
   :keep-visual t
   (interactive "<c>")
-  (if count
-      (progn
-        (goto-char (point-min))
-        (forward-line (1- count)))
+  (unless count
     (goto-char (window-end))
-    (evil-move-cursor-back))
-  (recenter (1- (max 0 scroll-margin)))
-  (evil-first-non-blank))
+    (evil-first-non-blank))
+  (evil-scroll-line-to-top count))
 
 (evil-define-command evil-scroll-top-line-to-bottom (count)
-  "Scroll the line right below the window,
-or line COUNT to the top of the window."
+  "Scroll the line right above the window,
+or line COUNT to the bottom of the window."
   :repeat nil
   :keep-visual t
   (interactive "<c>")
-  (if count
-      (progn
-        (goto-char (point-min))
-        (forward-line (1- count)))
-    (goto-char (window-start)))
-  (recenter (- (max 1 scroll-margin)))
-  (evil-first-non-blank))
+  (unless count
+    (goto-char (window-start))
+    (evil-first-non-blank))
+  (evil-scroll-line-to-bottom count))
 
 (evil-define-command evil-scroll-left (count)
   "Scroll the window COUNT half-screenwidths to the left."