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

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/09/19 13:12:50

Index: simple.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/simple.el,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -b -r1.823 -r1.824
--- simple.el   18 Sep 2006 11:13:04 -0000      1.823
+++ simple.el   19 Sep 2006 13:12:50 -0000      1.824
@@ -3507,9 +3507,11 @@
          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,