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

[Dan Nicolaescu]

Index: emacs/lisp/term.el
diff -c emacs/lisp/term.el:1.78 emacs/lisp/term.el:1.79
*** emacs/lisp/term.el:1.78     Wed Oct 26 18:57:44 2005
--- emacs/lisp/term.el  Tue Nov 15 17:13:21 2005
***************
*** 1406,1413 ****
  :UP=\\E[%%dA:DO=\\E[%%dB:LE=\\E[%%dD:RI=\\E[%%dC\
  :kl=\\EOD:kd=\\EOB:kr=\\EOC:ku=\\EOA:kN=\\E[6~:kP=\\E[5~:@7=\\E[4~:kh=\\E[1~\
  :mk=\\E[8m:cb=\\E[1K:op=\\E[39;49m:Co#8:pa#64:AB=\\E[4%%dm:AF=\\E[3%%dm:cr=^M\
! :bl=^G:do=^J:le=^H:ta=^I:se=\E[27m:ue=\E24m\
! :kb=^?:kD=^[[3~:sc=\E7:rc=\E8:r1=\Ec:"
  ;;; : -undefine ic
  ;;; don't define :te=\\E[2J\\E[?47l\\E8:ti=\\E7\\E[?47h\
    "termcap capabilities supported")
--- 1406,1413 ----
  :UP=\\E[%%dA:DO=\\E[%%dB:LE=\\E[%%dD:RI=\\E[%%dC\
  :kl=\\EOD:kd=\\EOB:kr=\\EOC:ku=\\EOA:kN=\\E[6~:kP=\\E[5~:@7=\\E[4~:kh=\\E[1~\
  :mk=\\E[8m:cb=\\E[1K:op=\\E[39;49m:Co#8:pa#64:AB=\\E[4%%dm:AF=\\E[3%%dm:cr=^M\
! :bl=^G:do=^J:le=^H:ta=^I:se=\\E[27m:ue=\\E24m\
! :kb=^?:kD=^[[3~:sc=\\E7:rc=\\E8:r1=\\Ec:"
  ;;; : -undefine ic
  ;;; don't define :te=\\E[2J\\E[?47l\\E8:ti=\\E7\\E[?47h\
    "termcap capabilities supported")
***************
*** 3615,3635 ****
  (defun term-down (down &optional check-for-scroll)
    "Move down DOWN screen lines vertically."
    (let ((start-column (term-horizontal-column)))
!     (if (and check-for-scroll (or term-scroll-with-delete term-pager-count))
!       (setq down (term-handle-scroll down)))
!     (term-adjust-current-row-cache down)
!     (if (or (/= (point) (point-max)) (< down 0))
!       (setq down (- down (term-vertical-motion down))))
!     ;; Extend buffer with extra blank lines if needed.
      (cond ((> down 0)
           (term-insert-char ?\n down)
           (setq term-current-column 0)
           (setq term-start-line-column 0))
          (t
!          (setq term-current-column nil)
           (setq term-start-line-column (current-column))))
!     (if start-column
!       (term-move-columns start-column))))
  
  ;; Assuming point is at the beginning of a screen line,
  ;; if the line above point wraps around, add a ?\n to undo the wrapping.
--- 3615,3646 ----
  (defun term-down (down &optional check-for-scroll)
    "Move down DOWN screen lines vertically."
    (let ((start-column (term-horizontal-column)))
!     (when (and check-for-scroll (or term-scroll-with-delete term-pager-count))
!       (setq down (term-handle-scroll down)))
!     (unless (and (= term-current-row 0) (< down 0))
!       (term-adjust-current-row-cache down)
!       (when (or (/= (point) (point-max)) (< down 0))
!       (setq down (- down (term-vertical-motion down)))))
      (cond ((> down 0)
+          ;; Extend buffer with extra blank lines if needed.
           (term-insert-char ?\n down)
           (setq term-current-column 0)
           (setq term-start-line-column 0))
          (t
!          (when (= term-current-row 0)
!            ;; Insert lines if at the beginning.
!            (save-excursion (term-insert-char ?\n (- down)))
!            (save-excursion
!              (let (p)
!                ;; Delete lines from the end.
!                (forward-line term-height)
!                (setq p (point))
!                (forward-line (- down))
!                (delete-region p (point)))))
!          (setq term-current-column 0)
           (setq term-start-line-column (current-column))))
!     (when start-column
!       (term-move-columns start-column))))
  
  ;; Assuming point is at the beginning of a screen line,
  ;; if the line above point wraps around, add a ?\n to undo the wrapping.
***************
*** 3695,3701 ****
  
  ;;; Insert COUNT spaces after point, but do not change any of
  ;;; following screen lines.  Hence we may have to delete characters
! ;;; at teh end of this screen line to make room.
  
  (defun term-insert-spaces (count)
    (let ((save-point (point)) (save-eol) (point-at-eol))
--- 3706,3712 ----
  
  ;;; Insert COUNT spaces after point, but do not change any of
  ;;; following screen lines.  Hence we may have to delete characters
! ;;; at the end of this screen line to make room.
  
  (defun term-insert-spaces (count)
    (let ((save-point (point)) (save-eol) (point-at-eol))