diff options
| author | Karl Heuer | 1997-12-11 07:25:16 +0000 |
|---|---|---|
| committer | Karl Heuer | 1997-12-11 07:25:16 +0000 |
| commit | 71a895c6096c20ae21322fb4e0fc5b2efae2039f (patch) | |
| tree | aca9080fa13c165e83bf6b320f8f840b363fb9cb | |
| parent | f0ed3f3e5328cfc9bdea77c6d7227f23b463bb4b (diff) | |
| download | emacs-71a895c6096c20ae21322fb4e0fc5b2efae2039f.tar.gz emacs-71a895c6096c20ae21322fb4e0fc5b2efae2039f.zip | |
(comint-strip-ctrl-m): Don't die if
comint-last-output-start does not point anywhere.
| -rw-r--r-- | lisp/comint.el | 6 |
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." | |||
| 1386 | (interactive) | 1386 | (interactive) |
| 1387 | (let ((pmark (process-mark (get-buffer-process (current-buffer))))) | 1387 | (let ((pmark (process-mark (get-buffer-process (current-buffer))))) |
| 1388 | (save-excursion | 1388 | (save-excursion |
| 1389 | (goto-char | 1389 | (condition-case nil |
| 1390 | (if (interactive-p) comint-last-input-end comint-last-output-start)) | 1390 | (goto-char |
| 1391 | (if (interactive-p) comint-last-input-end comint-last-output-start)) | ||
| 1392 | (error nil)) | ||
| 1391 | (while (re-search-forward "\r+$" pmark t) | 1393 | (while (re-search-forward "\r+$" pmark t) |
| 1392 | (replace-match "" t t))))) | 1394 | (replace-match "" t t))))) |
| 1393 | (defalias 'shell-strip-ctrl-m 'comint-strip-ctrl-m) | 1395 | (defalias 'shell-strip-ctrl-m 'comint-strip-ctrl-m) |