summaryrefslogtreecommitdiff
path: root/lisp/comint.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1997-12-11 07:25:16 +0000
committerKarl Heuer <kwzh@gnu.org>1997-12-11 07:25:16 +0000
commit71a895c6096c20ae21322fb4e0fc5b2efae2039f (patch)
treeaca9080fa13c165e83bf6b320f8f840b363fb9cb /lisp/comint.el
parentf0ed3f3e5328cfc9bdea77c6d7227f23b463bb4b (diff)
downloademacs-71a895c6096c20ae21322fb4e0fc5b2efae2039f.tar.gz
(comint-strip-ctrl-m): Don't die if
comint-last-output-start does not point anywhere.
Diffstat (limited to 'lisp/comint.el')
-rw-r--r--lisp/comint.el6
1 files 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)