(shell-strip-ctrl-m): Strip multiple ^Ms.

diff --git a/lisp/shell.el b/lisp/shell.el
index c7beee72b9905515fa404e406d80e7655c95989d..85db10b4fd74223729e8d5983e680e8ad650da3d 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -810,12 +810,11 @@ Returns t if successful."
 This function could be in the list `comint-output-filter-functions' or bound to
 a key."
   (interactive)
-  (let ((pmark (process-mark (get-buffer-process (current-buffer))))
-       (ctrl-m (concat (char-to-string 13) "$")))
+  (let ((pmark (process-mark (get-buffer-process (current-buffer)))))
     (save-excursion
       (goto-char
        (if (interactive-p) comint-last-input-end comint-last-output-start))
-      (while (re-search-forward ctrl-m pmark t)
+      (while (re-search-forward "\r+$" pmark t)
        (replace-match "" t t)))))
 \f
 (provide 'shell)