1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00

(term-move-columns): Fix face after extending a line.

(term-insert-spaces): Likewise.
(term-reset-terminal): Fix off by one error.
This commit is contained in:
Dan Nicolaescu 2005-03-26 22:32:43 +00:00
parent 1fa7647f50
commit 99a5658144
2 changed files with 27 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2005-03-26 Dan Nicolaescu <dann@ics.uci.edu>
* term.el (term-move-columns): Fix face after extending a line.
(term-insert-spaces): Likewise.
(term-reset-terminal): Fix off by one error.
2005-03-26 Eli Zaretskii <eliz@gnu.org>
* international/mule.el (auto-coding-alist): Add .xpi files.

View File

@ -2573,7 +2573,16 @@ See `term-prompt-regexp'."
(defun term-move-columns (delta)
(setq term-current-column (max 0 (+ (term-current-column) delta)))
(move-to-column term-current-column t))
(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,7 +3037,7 @@ See `term-prompt-regexp'."
;;; default one.
(defun term-reset-terminal ()
(erase-buffer)
(setq term-current-row 1)
(setq term-current-row 0)
(setq term-current-column 1)
(setq term-insert-mode nil)
(setq term-current-face nil)
@ -3037,7 +3046,7 @@ See `term-prompt-regexp'."
(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-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,12 +3694,20 @@ Should only be called when point is at the start of a screen line."
;;; at teh end of this screen line to make room.
(defun term-insert-spaces (count)
(let ((save-point (point)) (save-eol))
(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)