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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   06/06/15 22:58:11

Index: term.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/term.el,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- term.el     29 May 2006 06:11:32 -0000      1.83
+++ term.el     15 Jun 2006 22:58:10 -0000      1.84
@@ -3613,7 +3613,7 @@
                   (progn
                     ;; Delete scroll-needed lines at term-scroll-end,
                     ;; then insert scroll-needed lines.
-                    (term-vertical-motion (1- term-scroll-end))
+                    (term-vertical-motion term-scroll-end)
                     (end-of-line)
                     (setq save-top (point))
                     (term-vertical-motion scroll-needed)
@@ -3767,11 +3767,12 @@
        (save-current-column term-current-column)
        (save-start-line-column term-start-line-column)
        (save-current-row (term-current-row)))
-    (when (>= (+ save-current-row lines) term-scroll-end)
-       (setq lines (- lines (- (+ save-current-row lines) term-scroll-end))))
+    ;; The number of inserted lines shouldn't exceed the scroll region end.
+    (when (> (+ save-current-row lines) (1+ term-scroll-end))
+      (setq lines (- lines (- (+ save-current-row lines) (1+ 
term-scroll-end)))))
     (term-down lines)
     (delete-region start (point))
-    (term-down (- term-scroll-end save-current-row lines))
+    (term-down (- (1+ term-scroll-end) save-current-row lines))
     (term-insert-char ?\n lines)
     (setq term-current-column save-current-column)
     (setq term-start-line-column save-start-line-column)
@@ -3792,9 +3793,9 @@
          (term-down (- term-scroll-start save-current-row))
          (setq start (point)))
       ;; The number of inserted lines shouldn't exceed the scroll region end.
-      (when (>= (+ save-current-row lines) term-scroll-end)
-       (setq lines (- lines (- (+ save-current-row lines) term-scroll-end))))
-      (term-down (- term-scroll-end save-current-row lines)))
+      (when (> (+ save-current-row lines) (1+ term-scroll-end))
+       (setq lines (- lines (- (+ save-current-row lines)(1+ 
term-scroll-end)))))
+      (term-down (- (1+ term-scroll-end) save-current-row lines)))
     (setq start-deleted (point))
     (term-down lines)
     (delete-region start-deleted (point))