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

[Kim F . Storm]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.690 emacs/lisp/simple.el:1.691
*** emacs/lisp/simple.el:1.690  Thu Feb 10 06:47:58 2005
--- emacs/lisp/simple.el        Sat Feb 19 23:30:29 2005
***************
*** 3158,3169 ****
          (let ((abbrev-mode nil))
            (end-of-line)
            (insert "\n"))
!       (line-move arg))
      (if (interactive-p)
        (condition-case nil
!           (line-move arg)
          ((beginning-of-buffer end-of-buffer) (ding)))
!       (line-move arg)))
    nil)
  
  (defun previous-line (&optional arg)
--- 3158,3169 ----
          (let ((abbrev-mode nil))
            (end-of-line)
            (insert "\n"))
!       (line-move arg nil nil t))
      (if (interactive-p)
        (condition-case nil
!           (line-move arg nil nil t)
          ((beginning-of-buffer end-of-buffer) (ding)))
!       (line-move arg nil nil t)))
    nil)
  
  (defun previous-line (&optional arg)
***************
*** 3186,3194 ****
    (or arg (setq arg 1))
    (if (interactive-p)
        (condition-case nil
!         (line-move (- arg))
        ((beginning-of-buffer end-of-buffer) (ding)))
!     (line-move (- arg)))
    nil)
  
  (defcustom track-eol nil
--- 3186,3194 ----
    (or arg (setq arg 1))
    (if (interactive-p)
        (condition-case nil
!         (line-move (- arg) nil nil t)
        ((beginning-of-buffer end-of-buffer) (ding)))
!     (line-move (- arg) nil nil t))
    nil)
  
  (defcustom track-eol nil
***************
*** 3227,3234 ****
          (assq prop buffer-invisibility-spec)))))
  
  ;; Perform vertical scrolling of tall images if necessary.
! (defun line-move (arg &optional noerror to-end)
!   (if auto-window-vscroll
        (let ((forward (> arg 0))
            (part (nth 2 (pos-visible-in-window-p (point) nil t))))
        (if (and (consp part)
--- 3227,3234 ----
          (assq prop buffer-invisibility-spec)))))
  
  ;; Perform vertical scrolling of tall images if necessary.
! (defun line-move (arg &optional noerror to-end try-vscroll)
!   (if (and auto-window-vscroll try-vscroll)
        (let ((forward (> arg 0))
            (part (nth 2 (pos-visible-in-window-p (point) nil t))))
        (if (and (consp part)
***************
*** 3244,3250 ****
                                               (* (frame-char-height) (- 
arg))))))
                                t)
          (set-window-vscroll nil 0)
!         (line-move-1 arg noerror to-end)))
      (line-move-1 arg noerror to-end)))
  
  ;; This is the guts of next-line and previous-line.
--- 3244,3257 ----
                                               (* (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)))
  
  ;; This is the guts of next-line and previous-line.