2 files changed, 8 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95f64399da5..00a56524b34 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-21  Ivan Shmakov  <oneingray@gmail.com>  (tiny change)
+
+        * progmodes/tcl.el (tcl-filter): Don't forcibly move point.
+
 2008-11-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * international/quail.el (quail-indent-to): New function.
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index f0c49506161..13b2f4a11f4 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -1029,14 +1029,12 @@ Returns nil if line starts inside a string, t if in a comment."
 (defvar inferior-tcl-delete-prompt-marker nil)
 
 (defun tcl-filter (proc string)
-  (let ((inhibit-quit t))
+  (let ((inhibit-quit t))               ;FIXME: Isn't that redundant?
     (with-current-buffer (process-buffer proc)
-      (goto-char (process-mark proc))
       ;; Delete prompt if requested.
-      (if (marker-buffer inferior-tcl-delete-prompt-marker)
-          (progn
-            (delete-region (point) inferior-tcl-delete-prompt-marker)
-            (set-marker inferior-tcl-delete-prompt-marker nil)))))
+      (when (marker-buffer inferior-tcl-delete-prompt-marker)
+        (delete-region (process-mark proc) inferior-tcl-delete-prompt-marker)
+        (set-marker inferior-tcl-delete-prompt-marker nil))))
   (comint-output-filter proc string))
 
 (defun tcl-send-string (proc string)