From 8bd3aa929a0ce6510d7c7550070f569caa65ec5e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 18 Mar 2019 17:44:21 -0700 Subject: [PATCH] Remove buggy regexp use in comint-output-filter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2012-07-02T16:18:02!monnier@iro.umontreal.ca which perhaps could be rethought and recommitted, and perhaps it’s no longer needed now that comint-use-prompt-regexp is almost always nil. * lisp/comint.el (comint-output-filter): Don’t try to skip repeated prompts, since comint-prompt-regexp typically begins with "^" and the resulting "^^" in the regular expression does not have the desired effect. Noted by Mattias Engdegård in: https://lists.gnu.org/r/emacs-devel/2019-03/msg00380.html --- lisp/comint.el | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/lisp/comint.el b/lisp/comint.el index a71821baa5..d21cc1378f 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -2072,20 +2072,6 @@ comint-output-filter (goto-char (process-mark process)) (set-marker comint-last-output-start (point)) - ;; Try to skip repeated prompts, which can occur as a result of - ;; commands sent without inserting them in the buffer. - (let ((bol (save-excursion (forward-line 0) (point)))) ;No fields. - (when (and (not (bolp)) - (looking-back comint-prompt-regexp bol)) - (let* ((prompt (buffer-substring bol (point))) - (prompt-re (concat "\\`" (regexp-quote prompt)))) - (while (string-match prompt-re string) - (setq string (substring string (match-end 0))))))) - (while (string-match (concat "\\(^" comint-prompt-regexp - "\\)\\1+") - string) - (setq string (replace-match "\\1" nil nil string))) - ;; insert-before-markers is a bad thing. XXX ;; Luckily we don't have to use it any more, we use ;; window-point-insertion-type instead. -- 2.20.1