From 71a895c6096c20ae21322fb4e0fc5b2efae2039f Mon Sep 17 00:00:00 2001
From: Karl Heuer <kwzh@gnu.org>
Date: Thu, 11 Dec 1997 07:25:16 +0000
Subject: [PATCH] (comint-strip-ctrl-m): Don't die if comint-last-output-start
 does not point anywhere.

---
 lisp/comint.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/comint.el b/lisp/comint.el
index 39a084f9cf3..8b18dedd30c 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1386,8 +1386,10 @@ This function could be on `comint-output-filter-functions' or bound to a key."
   (interactive)
   (let ((pmark (process-mark (get-buffer-process (current-buffer)))))
     (save-excursion
-      (goto-char
-       (if (interactive-p) comint-last-input-end comint-last-output-start))
+      (condition-case nil
+	  (goto-char
+	   (if (interactive-p) comint-last-input-end comint-last-output-start))
+	(error nil))
       (while (re-search-forward "\r+$" pmark t)
 	(replace-match "" t t)))))
 (defalias 'shell-strip-ctrl-m 'comint-strip-ctrl-m)
-- 
2.39.2