X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/33ba5485ee492cc17c037e7ff97eccd305f57cb0..be415ea70e7653e4ce342016c6596499006120fb:/lisp/comint.el

diff --git a/lisp/comint.el b/lisp/comint.el
index 880866114e..42c2fb8830 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1422,7 +1422,8 @@ This function should be in the list `comint-output-filter-functions'."
 				  (and (eq scroll 'this) (eq selected window))
 				  (and (eq scroll 'others) (not (eq selected window)))
 				  ;; If point was at the end, keep it at end.
-				  (>= (point) comint-last-output-start)))
+                                  (and (marker-position comint-last-output-start)
+                                       (>= (point) comint-last-output-start))))
 			 (goto-char (process-mark process)))
 		     ;; Optionally scroll so that the text
 		     ;; ends at the bottom of the window.
@@ -2338,7 +2339,7 @@ is at the beginning of the current input line; but if you have
 used \\[comint-accumulate] to send multiple lines at once,
 the process mark is at the beginning of the accumulated input."
   (interactive)
-  (if (not (eq last-command 'comint-bol-or-mark))
+  (if (not (eq last-command 'comint-bol-or-process-mark))
       (comint-bol nil)
     (comint-goto-process-mark)))