(comint-get-old-input-default): Strip text properties for fields too.

(comint-output-filter): Run output-filter functions before setting up
the prompt.

2 files changed, 10 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3ede33d669..ae5a8eca617 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,13 +1,14 @@
 2002-06-20  Miles Bader  <miles@gnu.org>
 
-        * international/characters.el: Re-enable code giving word syntax
-        to certain japanese-jisx0208 characters.
-
-2002-06-18  Miles Bader  <miles@gnu.org>
+        * comint.el (comint-get-old-input-default): Strip text properties
+        for fields too.
 
         * comint.el (comint-output-filter): Run output-filter functions
         before setting up the prompt.
 
+        * international/characters.el: Re-enable code giving word syntax
+        to certain japanese-jisx0208 characters.
+
 2002-06-19  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
         * progmodes/f90.el (f90-type-def-re): Fix value.
diff --git a/lisp/comint.el b/lisp/comint.el
index 9ae5947714e..bdbe2fdb709 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1660,6 +1660,9 @@ This function should be in the list `comint-output-filter-functions'."
             ;; Advance process-mark
             (set-marker (process-mark process) (point))
 
+            (run-hook-with-args 'comint-output-filter-functions string)
+            (goto-char (process-mark process)) ; in case a filter moved it
+
             (unless comint-use-prompt-regexp-instead-of-fields
               (let ((inhibit-read-only t))
                 (add-text-properties comint-last-output-start (point)
@@ -1684,9 +1687,7 @@ This function should be in the list `comint-output-filter-functions'."
                   (overlay-put comint-last-prompt-overlay
                                'font-lock-face 'comint-highlight-prompt))))
 
-            (goto-char saved-point)
-
-            (run-hook-with-args 'comint-output-filter-functions string)))))))
+            (goto-char saved-point)))))))
 
 (defun comint-preinput-scroll-to-bottom ()
   "Go to the end of buffer in all windows showing it.
@@ -1794,7 +1795,7 @@ the current line with any initial string matching the regexp
 `comint-prompt-regexp' removed."
   (let ((bof (field-beginning)))
     (if (eq (get-char-property bof 'field) 'input)
-        (field-string bof)
+        (field-string-no-properties bof)
       (comint-bol)
       (buffer-substring-no-properties (point) (line-end-position)))))