[Emacs-diffs] Changes to emacs/lisp/simple.el

[Kim F . Storm]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.723 emacs/lisp/simple.el:1.724
*** emacs/lisp/simple.el:1.723  Tue May 31 09:32:06 2005
--- emacs/lisp/simple.el        Fri Jun  3 23:48:21 2005
***************
*** 3351,3375 ****
        (let ((forward (> arg 0))
            (part (nth 2 (pos-visible-in-window-p (point) nil t))))
        (if (and (consp part)
!                (> (setq part (if forward (cdr part) (car part))) 0))
            (set-window-vscroll nil
                                (if forward
                                    (+ (window-vscroll nil t)
!                                      (min part
                                            (* (frame-char-height) arg)))
                                  (max 0
                                       (- (window-vscroll nil t)
!                                         (min part
                                               (* (frame-char-height) (- 
arg))))))
                                t)
          (set-window-vscroll nil 0)
          (when (line-move-1 arg noerror to-end)
!           (sit-for 0)
!           (if (and (not forward)
!                    (setq part (nth 2 (pos-visible-in-window-p
!                                       (line-beginning-position) nil t)))
!                    (> (cdr part) 0))
!               (set-window-vscroll nil (cdr part) t))
            t)))
      (line-move-1 arg noerror to-end)))
  
--- 3351,3375 ----
        (let ((forward (> arg 0))
            (part (nth 2 (pos-visible-in-window-p (point) nil t))))
        (if (and (consp part)
!                (> (if forward (cdr part) (car part)) 0))
            (set-window-vscroll nil
                                (if forward
                                    (+ (window-vscroll nil t)
!                                      (min (cdr part)
                                            (* (frame-char-height) arg)))
                                  (max 0
                                       (- (window-vscroll nil t)
!                                         (min (car part)
                                               (* (frame-char-height) (- 
arg))))))
                                t)
          (set-window-vscroll nil 0)
          (when (line-move-1 arg noerror to-end)
!           (when (not forward)
!             (sit-for 0)
!             (if (and (setq part (nth 2 (pos-visible-in-window-p
!                                         (line-beginning-position) nil t)))
!                      (> (cdr part) 0))
!                 (set-window-vscroll nil (cdr part) t)))
            t)))
      (line-move-1 arg noerror to-end)))