From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 22 May 1994 00:51:36 +0000 (+0000)
Subject: (shell-strip-ctrl-m): Strip multiple ^Ms.
X-Git-Tag: emacs-19.34~8243
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bb55b64df0e836f7547c47c90377e394f86e59d4;p=emacs.git

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

diff --git a/lisp/shell.el b/lisp/shell.el
index c7beee72b99..85db10b4fd7 100644
--- 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)))))
 
 (provide 'shell)