From 2bdcec1e1f9a3ce0314d182a4c50887e8ec80a17 Mon Sep 17 00:00:00 2001 Message-Id: <2bdcec1e1f9a3ce0314d182a4c50887e8ec80a17.1679480064.git.yantar92@posteo.net> From: Ihor Radchenko Date: Wed, 22 Mar 2023 11:12:30 +0100 Subject: [PATCH] org-babel-comint-with-output: Handle agglomerated prompts better * lisp/ob-comint.el (org-babel-comint-with-output): Consider that comint can sometimes agglomerate multiple prompts together even within a single output increment as passed to `comint-output-filter-functions'. Example in GHC comint buffer: GHCi, version 9.0.2: https://www.haskell.org/ghc/ :? for help ghci> ghci> :{ main :: IO () main = putStrLn "Hello World!" :} main "org-babel-haskell-eoe" ghci| ghci| ghci| ghci> ghci> Hello World! ghci> "org-babel-haskell-eoe" ghci> --- lisp/ob-comint.el | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el index 54bf5127e..e167d911b 100644 --- a/lisp/ob-comint.el +++ b/lisp/ob-comint.el @@ -91,7 +91,16 @@ (defmacro org-babel-comint-with-output (meta &rest body) ;; trailing newline. Use more reliable ;; match to split the output later. (replace-regexp-in-string - comint-prompt-regexp + ;; Sometimes, we get multiple agglomerated + ;; prompts together in a single output: + ;; "prompt prompt prompt output" + ;; Remove them progressively, so that + ;; possible "^" in the prompt regexp gets to + ;; work as we remove the heading prompt + ;; instance. + (if (string-prefix-p "^" comint-prompt-regexp) + (format "^\\(%s\\)+" (substring comint-prompt-regexp 1)) + comint-prompt-regexp) ,org-babel-comint-prompt-separator text)))) comint-output-filter-functions)) -- 2.39.1