From 6e1440613b7b19c90beed91ed20fd51aac500e65 Mon Sep 17 00:00:00 2001 From: Bruno BARBIER Date: Sat, 1 Apr 2023 10:19:24 +0200 Subject: [PATCH 09/13] lisp/ob-haskell.el: Simplify org-babel-haskell-eoe lisp/ob-haskell.el (org-babel-haskell-eoe): New default value. (org-babel-interpret-haskell): Update for the new value of `org-babel-haskell-eoe'. --- lisp/ob-haskell.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el index 6bbc91439..98b1b10f0 100644 --- a/lisp/ob-haskell.el +++ b/lisp/ob-haskell.el @@ -63,7 +63,7 @@ (defvar org-babel-default-header-args:haskell (defvar org-babel-haskell-lhs2tex-command "lhs2tex") -(defvar org-babel-haskell-eoe "\"org-babel-haskell-eoe\"") +(defvar org-babel-haskell-eoe "org-babel-haskell-eoe") (defvar haskell-prompt-regexp) @@ -143,7 +143,7 @@ (defun org-babel-interpret-haskell (body params) (session org-babel-haskell-eoe nil full-body) (insert (org-trim full-body)) (comint-send-input nil t) - (insert (concat "putStrLn (\"\\\"\" ++ " org-babel-haskell-eoe " ++ \"\\\"\")\n")) + (insert (concat "putStrLn \"" org-babel-haskell-eoe "\"\n")) (comint-send-input nil t))) (`value (org-babel-comint-with-output (session org-babel-haskell-eoe nil full-body) @@ -153,13 +153,13 @@ (defun org-babel-interpret-haskell (body params) (comint-send-input nil t) (insert "__LAST_VALUE_IMPROBABLE_NAME__=it\n") (comint-send-input nil t) - (insert (concat "putStrLn (\"\\\"\" ++ " org-babel-haskell-eoe " ++ \"\\\"\")\n")) + (insert (concat "putStrLn \"" org-babel-haskell-eoe "\"\n")) (comint-send-input nil t)) (org-babel-comint-with-output (session org-babel-haskell-eoe nil) (insert "__LAST_VALUE_IMPROBABLE_NAME__\n") (comint-send-input nil t) - (insert (concat "putStrLn (\"\\\"\" ++ " org-babel-haskell-eoe " ++ \"\\\"\")\n")) + (insert (concat "putStrLn \"" org-babel-haskell-eoe "\"\n")) (comint-send-input nil t)) ) )) -- 2.39.3