aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-08-03 10:49:56 +0000
committerDan Nicolaescu2007-08-03 10:49:56 +0000
commit1bb751ed2bab9205dc6dddd155c32d9e1be27f76 (patch)
tree8ef8c3be59435a87b5b1d5630d3fef668fd33245
parent0896d93184a719bc994a3e699de27190aac0acb1 (diff)
downloademacs-1bb751ed2bab9205dc6dddd155c32d9e1be27f76.tar.gz
emacs-1bb751ed2bab9205dc6dddd155c32d9e1be27f76.zip
(term-erase-in-display): Fix case when point is not at
the beginning of the line.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term.el8
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d35fa06ac5..cfbc404dc51 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-08-03 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * term.el (term-erase-in-display): Fix case when point is not at
4 the beginning of the line.
5
12007-08-03 Jay Belanger <jay.p.belanger@gmail.com> 62007-08-03 Jay Belanger <jay.p.belanger@gmail.com>
2 7
3 * calc/calc-ext.el (math-get-value,math-get-sdev) 8 * calc/calc-ext.el (math-get-value,math-get-sdev)
diff --git a/lisp/term.el b/lisp/term.el
index c7b5ee249d1..55c5090fb2c 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -3715,12 +3715,12 @@ all pending output has been dealt with."))
3715(defun term-erase-in-display (kind) 3715(defun term-erase-in-display (kind)
3716 "Erases (that is blanks out) part of the window. 3716 "Erases (that is blanks out) part of the window.
3717If KIND is 0, erase from (point) to (point-max); 3717If KIND is 0, erase from (point) to (point-max);
3718if KIND is 1, erase from home to point; else erase from home to point-max. 3718if KIND is 1, erase from home to point; else erase from home to point-max."
3719Should only be called when point is at the start of a screen line."
3720 (term-handle-deferred-scroll) 3719 (term-handle-deferred-scroll)
3721 (cond ((eq term-terminal-parameter 0) 3720 (cond ((eq term-terminal-parameter 0)
3722 (delete-region (point) (point-max)) 3721 (let ((need-unwrap (bolp)))
3723 (term-unwrap-line)) 3722 (delete-region (point) (point-max))
3723 (when need-unwrap (term-unwrap-line))))
3724 ((let ((row (term-current-row)) 3724 ((let ((row (term-current-row))
3725 (col (term-horizontal-column)) 3725 (col (term-horizontal-column))
3726 (start-region term-home-marker) 3726 (start-region term-home-marker)