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

[Dan Nicolaescu]

Index: emacs/lisp/term.el
diff -c emacs/lisp/term.el:1.63 emacs/lisp/term.el:1.64
*** emacs/lisp/term.el:1.63     Sat Dec 11 21:05:17 2004
--- emacs/lisp/term.el  Sat Mar 26 22:32:43 2005
***************
*** 2573,2579 ****
  
  (defun term-move-columns (delta)
    (setq term-current-column (max 0 (+ (term-current-column) delta)))
!   (move-to-column term-current-column t))
  
  ;; Insert COUNT copies of CHAR in the default face.
  (defun term-insert-char (char count)
--- 2573,2588 ----
  
  (defun term-move-columns (delta)
    (setq term-current-column (max 0 (+ (term-current-column) delta)))
!   (let (point-at-eol)
!     (save-excursion
!       (end-of-line)
!       (setq point-at-eol (point)))
!     (move-to-column term-current-column t)
!     ;; If move-to-column extends the current line it will use the face
!     ;; from the last character on the line, set the face for the chars
!     ;; to default.
!     (when (> (point) point-at-eol)
!       (put-text-property point-at-eol (point) 'face 'default))))
  
  ;; Insert COUNT copies of CHAR in the default face.
  (defun term-insert-char (char count)
***************
*** 3028,3034 ****
  ;;; default one. 
  (defun term-reset-terminal ()
    (erase-buffer)
!   (setq term-current-row 1)
    (setq term-current-column 1)
    (setq term-insert-mode nil)
    (setq term-current-face nil)
--- 3037,3043 ----
  ;;; default one. 
  (defun term-reset-terminal ()
    (erase-buffer)
!   (setq term-current-row 0)
    (setq term-current-column 1)
    (setq term-insert-mode nil)
    (setq term-current-face nil)
***************
*** 3037,3043 ****
    (setq term-ansi-current-reverse 0)
    (setq term-ansi-current-color 0)
    (setq term-ansi-current-invisible 0)
!   (setq term-ansi-face-already-done 1)
    (setq term-ansi-current-bg-color 0))
  
  ;;; New function to deal with ansi colorized output, as you can see you can
--- 3046,3052 ----
    (setq term-ansi-current-reverse 0)
    (setq term-ansi-current-color 0)
    (setq term-ansi-current-invisible 0)
!   (setq term-ansi-face-already-done 0)
    (setq term-ansi-current-bg-color 0))
  
  ;;; New function to deal with ansi colorized output, as you can see you can
***************
*** 3685,3696 ****
  ;;; at teh end of this screen line to make room.
  
  (defun term-insert-spaces (count)
!   (let ((save-point (point)) (save-eol))
      (term-vertical-motion 1)
      (if (bolp)
        (backward-char))
      (setq save-eol (point))
      (move-to-column (+ (term-start-line-column) (- term-width count)) t)
      (if (> save-eol (point))
        (delete-region (point) save-eol))
      (goto-char save-point)
--- 3694,3713 ----
  ;;; at teh end of this screen line to make room.
  
  (defun term-insert-spaces (count)
!   (let ((save-point (point)) (save-eol) (point-at-eol))
      (term-vertical-motion 1)
      (if (bolp)
        (backward-char))
      (setq save-eol (point))
+     (save-excursion
+       (end-of-line)
+       (setq point-at-eol (point)))
      (move-to-column (+ (term-start-line-column) (- term-width count)) t)
+     ;; If move-to-column extends the current line it will use the face
+     ;; from the last character on the line, set the face for the chars
+     ;; to default.
+     (when (> (point) (point-at-eol))
+       (put-text-property point-at-eol (point) 'face 'default))
      (if (> save-eol (point))
        (delete-region (point) save-eol))
      (goto-char save-point)