aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2005-06-03 23:48:21 +0000
committerKim F. Storm2005-06-03 23:48:21 +0000
commit0fc367df131fab89a983198790c5437748d6f5cb (patch)
treeecd5a4d01b6d1d3f2742563053ecdec3d0fabf6f
parent555228aa599a4132c51d7daae62377f1e1ae8921 (diff)
downloademacs-0fc367df131fab89a983198790c5437748d6f5cb.tar.gz
emacs-0fc367df131fab89a983198790c5437748d6f5cb.zip
(line-move): Only call sit-for when moving backwards.
-rw-r--r--lisp/simple.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index b50707531d1..9a4ba9badcf 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3351,25 +3351,25 @@ Outline mode sets this."
3351 (let ((forward (> arg 0)) 3351 (let ((forward (> arg 0))
3352 (part (nth 2 (pos-visible-in-window-p (point) nil t)))) 3352 (part (nth 2 (pos-visible-in-window-p (point) nil t))))
3353 (if (and (consp part) 3353 (if (and (consp part)
3354 (> (setq part (if forward (cdr part) (car part))) 0)) 3354 (> (if forward (cdr part) (car part)) 0))
3355 (set-window-vscroll nil 3355 (set-window-vscroll nil
3356 (if forward 3356 (if forward
3357 (+ (window-vscroll nil t) 3357 (+ (window-vscroll nil t)
3358 (min part 3358 (min (cdr part)
3359 (* (frame-char-height) arg))) 3359 (* (frame-char-height) arg)))
3360 (max 0 3360 (max 0
3361 (- (window-vscroll nil t) 3361 (- (window-vscroll nil t)
3362 (min part 3362 (min (car part)
3363 (* (frame-char-height) (- arg)))))) 3363 (* (frame-char-height) (- arg))))))
3364 t) 3364 t)
3365 (set-window-vscroll nil 0) 3365 (set-window-vscroll nil 0)
3366 (when (line-move-1 arg noerror to-end) 3366 (when (line-move-1 arg noerror to-end)
3367 (sit-for 0) 3367 (when (not forward)
3368 (if (and (not forward) 3368 (sit-for 0)
3369 (setq part (nth 2 (pos-visible-in-window-p 3369 (if (and (setq part (nth 2 (pos-visible-in-window-p
3370 (line-beginning-position) nil t))) 3370 (line-beginning-position) nil t)))
3371 (> (cdr part) 0)) 3371 (> (cdr part) 0))
3372 (set-window-vscroll nil (cdr part) t)) 3372 (set-window-vscroll nil (cdr part) t)))
3373 t))) 3373 t)))
3374 (line-move-1 arg noerror to-end))) 3374 (line-move-1 arg noerror to-end)))
3375 3375