# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 971833381 0
# Node ID b7462e534fdcfc0dec227f645547919a59ff0f62
# Parent  df31899ab320f19e41808215ceaddc47b500532e
(comint-output-filter):
  Fixup comint-last-input-end too.
  Remove commented-out call to force-mode-line-update.
(comint-kill-output):
  Use `forward-line 0' instead of beginning-of-line to make sure we get
  past the prompt.

diff -r df31899ab320 -r b7462e534fdc lisp/comint.el
--- a/lisp/comint.el	Tue Oct 17 22:48:39 2000 +0000
+++ b/lisp/comint.el	Wed Oct 18 01:43:01 2000 +0000
@@ -1517,8 +1517,13 @@
 	    ;; Fixup markers and overlays that got screwed up because we
 	    ;; used `insert-before-markers'.
 	    (let ((old-point (- (point) (length string))))
-	      ;; comint-last-output-start marker
+	      ;; comint-last-output-start
 	      (set-marker comint-last-output-start old-point)
+	      ;; comint-last-input-end
+	      (when (and comint-last-input-end
+			 (equal (marker-position comint-last-input-end)
+				(point)))
+		(set-marker comint-last-input-end old-point))
 	      ;; No overlays we create are set to advance upon insertion
 	      ;; (at the start/end), so we assume that any overlay which
 	      ;; is at the current point was incorrectly advanced by
@@ -1579,8 +1584,6 @@
 		      (overlay-put over 'rear-nonsticky t)
 		      (setq comint-last-prompt-overlay over))))))
 
-	    ;;(force-mode-line-update)
-
 	    (goto-char saved-point)
 
 	    (run-hook-with-args 'comint-output-filter-functions string)))))))
@@ -1875,7 +1878,7 @@
 	(replacement nil))
     (save-excursion
       (let ((pmark (progn (goto-char (process-mark proc))
-			  (beginning-of-line nil)
+			  (forward-line 0)
 			  (point-marker))))
 	(delete-region comint-last-input-end pmark)
 	(goto-char (process-mark proc))