(comint-output-filter):

  Compare end of comint-last-output-overlay with the start of the newly
    inserted text, not the end, when deciding whether to extend it.
  Set saved-point's insertion type to advance after insertion.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7de63e94e5fd3083e095e42b0116fc7b3f2a24f..9bc3ac199854c2f7db4dd7bef36118dcd7ad37c7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-08-22  Miles Bader  <miles@lsi.nec.co.jp>
+
+       * comint.el (comint-output-filter): Compare end of
+       comint-last-output-overlay with the start of the newly inserted
+       text, not the end, when deciding whether to extend it.
+       Set saved-point's insertion type to advance after insertion.  
+
+       * shell.el (shell-font-lock-keywords): Remove prompt highlighting,
+       since this is now done independently of font-lock mode.
+
 2000-08-21  Gerd Moellmann  <gerd@gnu.org>
 
        * server.el (server-kill-new-buffers): New user option.

diff --git a/lisp/comint.el b/lisp/comint.el
index 8ed39e1c57f3846bbdf7609b3836bf49e829a9a4..292177191660020dca9715e1b33b6bf7b8c6ff60 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1499,6 +1499,9 @@ This variable is permanent-local.")
              ;; fiddle with the point
              (saved-point (point-marker)))
 
+         ;; The point should float after any insertion we do
+         (set-marker-insertion-type saved-point t)
+
          ;; We temporarly remove any buffer narrowing, in case the
          ;; process mark is outside of the restriction
          (save-restriction
@@ -1516,7 +1519,7 @@ This variable is permanent-local.")
              ;; adjacent to the new input, and if so, just extend it.
              (if (and comint-last-output-overlay
                       (equal (overlay-end comint-last-output-overlay)
-                             (point)))
+                             (marker-position comint-last-output-start)))
                  ;; Extend comint-last-output-overlay to include the
                  ;; most recent output
                  (move-overlay comint-last-output-overlay