2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8606f34f51..a1c574298ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-28  Romain Francoise  <romain@orebokech.com>
+
+        * comint.el (comint-show-output): Really set point at the
+        beginning of the output when not using `comint-use-prompt-regexp'.
+
 2005-09-27  Jay Belanger  <belanger@truman.edu>
 
         * calc/calc-lang.el (math-oper-table): Raise the precedence of "/"
diff --git a/lisp/comint.el b/lisp/comint.el
index 0977663808a..c92d0a10ad3 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2056,7 +2056,11 @@ Sets mark to the value of point when this command is run."
            (set-window-start (selected-window) (point))
            (comint-skip-prompt))
           (t
-           (goto-char (field-beginning pos))
+           (let* ((beg (field-beginning pos))
+                  (pt (if (= (point-min) beg)
+                          (point-min)
+                        (1+ beg))))
+             (goto-char pt))
            (set-window-start (selected-window) (point))))))