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

[Richard M . Stallman]

Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.727 emacs/lisp/simple.el:1.728
*** emacs/lisp/simple.el:1.727  Mon Jun  6 12:40:36 2005
--- emacs/lisp/simple.el        Wed Jun  8 15:35:05 2005
***************
*** 3342,3351 ****
        (or (memq prop buffer-invisibility-spec)
          (assq prop buffer-invisibility-spec)))))
  
! ;; Perform vertical scrolling of tall images if necessary.
! ;; Don't vscroll in a keyboard macro.
  (defun line-move (arg &optional noerror to-end try-vscroll)
    (if (and auto-window-vscroll try-vscroll
           (not defining-kbd-macro)
           (not executing-kbd-macro))
        (let ((forward (> arg 0))
--- 3342,3356 ----
        (or (memq prop buffer-invisibility-spec)
          (assq prop buffer-invisibility-spec)))))
  
! ;; This is like line-move-1 except that it also performs
! ;; vertical scrolling of tall images if appropriate.
! ;; That is not really a clean thing to do, since it mixes
! ;; scrolling with cursor motion.  But so far we don't have
! ;; a cleaner solution to the problem of making C-n do something
! ;; useful given a tall image.
  (defun line-move (arg &optional noerror to-end try-vscroll)
    (if (and auto-window-vscroll try-vscroll
+          ;; But don't vscroll in a keyboard macro.
           (not defining-kbd-macro)
           (not executing-kbd-macro))
        (let ((forward (> arg 0))
***************
*** 3368,3373 ****
--- 3373,3380 ----
              ;; Update display before calling pos-visible-in-window-p,
              ;; because it depends on window-start being up-to-date.
              (sit-for 0)
+             ;; If the current line is partly hidden at the bottom,
+             ;; scroll it partially up so as to unhide the bottom.
              (if (and (setq part (nth 2 (pos-visible-in-window-p
                                          (line-beginning-position) nil t)))
                       (> (cdr part) 0))