diff options
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/simple.el | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 724a6841bb7..dbd2474bd91 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -5,15 +5,15 @@ 2006-09-18 Michael Kifer <kifer@cs.stonybrook.edu> - * viper.el: Bumped up version/date of update to reflect the substantial + * viper.el: Bump up version/date of update to reflect the substantial changes done in August 2006. - * viper-cmd (viper-next-line-at-bol): make sure button-at, push-button + * viper-cmd (viper-next-line-at-bol): Make sure button-at, push-button are defined. - * ediff-util.el (ediff-add-to-history): new function. + * ediff-util.el (ediff-add-to-history): New function. - * ediff.el: use ediff-add-to-history instead of add-to-history. + * ediff.el: Use ediff-add-to-history instead of add-to-history. 2006-09-18 Wolfgang Jenkner <wjenkner@inode.at> (tiny change) diff --git a/lisp/simple.el b/lisp/simple.el index 0a257863a76..5a30471ca49 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -3507,9 +3507,11 @@ Outline mode sets this." nil) ;; If cursor is not in the bottom scroll margin, move forward. ((and (> vpos 0) - (< (setq ppos (posn-at-point) - py (cdr (or (posn-actual-col-row ppos) - (posn-col-row ppos)))) + (< (setq py + (or (nth 1 (window-line-height)) + (let ((ppos (posn-at-point))) + (cdr (or (posn-actual-col-row ppos) + (posn-col-row ppos)))))) (min (- (window-text-height) scroll-margin 1) (1- vpos)))) nil) ;; When already vscrolled, we vscroll some more if we can, |