aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/simple.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 7573789ad5c..595eba3129b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5829,7 +5829,7 @@ The value is a floating-point number."
5829 (/ (float (- (nth 3 edges) (nth 1 edges))) dlh))) 5829 (/ (float (- (nth 3 edges) (nth 1 edges))) dlh)))
5830 5830
5831;; Returns non-nil if partial move was done. 5831;; Returns non-nil if partial move was done.
5832(defun line-move-partial (arg noerror to-end) 5832(defun line-move-partial (arg noerror &optional _to-end)
5833 (if (< arg 0) 5833 (if (< arg 0)
5834 ;; Move backward (up). 5834 ;; Move backward (up).
5835 ;; If already vscrolled, reduce vscroll 5835 ;; If already vscrolled, reduce vscroll
@@ -5927,7 +5927,7 @@ The value is a floating-point number."
5927 ;; discrepancies between that and DLH. 5927 ;; discrepancies between that and DLH.
5928 (if (and rowh rbot (>= (- (+ rowh rbot) winh) 1)) 5928 (if (and rowh rbot (>= (- (+ rowh rbot) winh) 1))
5929 (set-window-vscroll nil dlh t)) 5929 (set-window-vscroll nil dlh t))
5930 (line-move-1 arg noerror to-end) 5930 (line-move-1 arg noerror)
5931 t) 5931 t)
5932 ;; If there are lines above the last line, scroll-up one line. 5932 ;; If there are lines above the last line, scroll-up one line.
5933 ((and vpos (> vpos 0)) 5933 ((and vpos (> vpos 0))
@@ -5944,7 +5944,7 @@ The value is a floating-point number."
5944;; scrolling with cursor motion. But so far we don't have 5944;; scrolling with cursor motion. But so far we don't have
5945;; a cleaner solution to the problem of making C-n do something 5945;; a cleaner solution to the problem of making C-n do something
5946;; useful given a tall image. 5946;; useful given a tall image.
5947(defun line-move (arg &optional noerror to-end try-vscroll) 5947(defun line-move (arg &optional noerror _to-end try-vscroll)
5948 "Move forward ARG lines. 5948 "Move forward ARG lines.
5949If NOERROR, don't signal an error if we can't move ARG lines. 5949If NOERROR, don't signal an error if we can't move ARG lines.
5950TO-END is unused. 5950TO-END is unused.
@@ -5952,7 +5952,7 @@ TRY-VSCROLL controls whether to vscroll tall lines: if either
5952`auto-window-vscroll' or TRY-VSCROLL is nil, this function will 5952`auto-window-vscroll' or TRY-VSCROLL is nil, this function will
5953not vscroll." 5953not vscroll."
5954 (if noninteractive 5954 (if noninteractive
5955 (line-move-1 arg noerror to-end) 5955 (line-move-1 arg noerror)
5956 (unless (and auto-window-vscroll try-vscroll 5956 (unless (and auto-window-vscroll try-vscroll
5957 ;; Only vscroll for single line moves 5957 ;; Only vscroll for single line moves
5958 (= (abs arg) 1) 5958 (= (abs arg) 1)
@@ -5962,7 +5962,7 @@ not vscroll."
5962 ;; But don't vscroll in a keyboard macro. 5962 ;; But don't vscroll in a keyboard macro.
5963 (not defining-kbd-macro) 5963 (not defining-kbd-macro)
5964 (not executing-kbd-macro) 5964 (not executing-kbd-macro)
5965 (line-move-partial arg noerror to-end)) 5965 (line-move-partial arg noerror))
5966 (set-window-vscroll nil 0 t) 5966 (set-window-vscroll nil 0 t)
5967 (if (and line-move-visual 5967 (if (and line-move-visual
5968 ;; Display-based column are incompatible with goal-column. 5968 ;; Display-based column are incompatible with goal-column.
@@ -5994,7 +5994,7 @@ not vscroll."
5994 (set-window-vscroll 5994 (set-window-vscroll
5995 nil 5995 nil
5996 (- lh dlh) t)))) 5996 (- lh dlh) t))))
5997 (line-move-1 arg noerror to-end))))) 5997 (line-move-1 arg noerror)))))
5998 5998
5999;; Display-based alternative to line-move-1. 5999;; Display-based alternative to line-move-1.
6000;; Arg says how many lines to move. The value is t if we can move the 6000;; Arg says how many lines to move. The value is t if we can move the