>From c629cb7041d25480cba82812ba5da41329f4e435 Mon Sep 17 00:00:00 2001 From: Matthew Trzcinski Date: Sun, 17 Mar 2024 16:58:52 +0100 Subject: [PATCH 4/7] lisp/ob-comint.el: Create comint echo filter * lisp/ob-comint.el (org-babel-comint--echo-filter): Extract echo filtering logic from `org-babel-comint-with-output' into a new function. --- lisp/ob-comint.el | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el index 882e19289..e8d8e7609 100644 --- a/lisp/ob-comint.el +++ b/lisp/ob-comint.el @@ -87,6 +87,15 @@ PROMPT-REGEXP defaults to `comint-prompt-regexp'." separator string))) (delete "" (split-string string separator)))) +(defun org-babel-comint--echo-filter (string &optional echo) + "Remove ECHO from STRING." + (and echo string + (string-match + (replace-regexp-in-string "\n" "[\r\n]+" (regexp-quote echo)) + string) + (setq string (substring string (match-end 0)))) + string) + (defmacro org-babel-comint-with-output (meta &rest body) "Evaluate BODY in BUFFER and return process output. Will wait until EOE-INDICATOR appears in the output, then return -- 2.41.0