remember the ob-comint-with-output is a macro

This commit is contained in:
Eric Schulte 2010-06-14 17:00:49 -07:00
parent 116d9cfa85
commit ca3f3baca6
7 changed files with 11 additions and 11 deletions

View File

@ -213,7 +213,7 @@ last statement in BODY, as elisp."
(output
(mapconcat #'org-babel-chomp (list body org-babel-R-eoe-indicator) "\n"))))
(raw
(org-babel-comint-with-output (list session org-babel-R-eoe-output)
(org-babel-comint-with-output (session org-babel-R-eoe-output)
(insert full-body) (inferior-ess-send-input)))
(comint-prompt-regexp
(concat "^\\("

View File

@ -72,7 +72,7 @@
(full-body (org-babel-expand-body:haskell body params processed-params))
(session (org-babel-prep-session:haskell session params))
(raw (org-babel-comint-with-output
(list session org-babel-haskell-eoe t full-body)
(session org-babel-haskell-eoe t full-body)
(insert (org-babel-trim full-body))
(comint-send-input nil t)
(insert org-babel-haskell-eoe)

View File

@ -64,7 +64,7 @@
(full-body (org-babel-expand-body:ocaml body params processed-params))
(session (org-babel-prep-session:ocaml session params))
(raw (org-babel-comint-with-output
(list session org-babel-ocaml-eoe-output t full-body)
(session org-babel-ocaml-eoe-output t full-body)
(insert (concat (org-babel-chomp full-body) " ;;"))
(comint-send-input nil t)
(insert org-babel-ocaml-eoe-indicator)

View File

@ -182,11 +182,11 @@ statement in BODY, as elisp."
;; available, so :results output currently
;; won't work
(org-babel-comint-with-output
(list session
(if matlabp
org-babel-octave-eoe-indicator
org-babel-octave-eoe-output)
t full-body)
(session
(if matlabp
org-babel-octave-eoe-indicator
org-babel-octave-eoe-output)
t full-body)
(insert full-body) (comint-send-input nil t)))) results)
(case result-type
(value

View File

@ -218,7 +218,7 @@ last statement in BODY, as elisp."
;; comint session evaluation
(org-babel-comint-in-buffer buffer
(let* ((raw (org-babel-comint-with-output
(list buffer org-babel-python-eoe-indicator t full-body)
(buffer org-babel-python-eoe-indicator t full-body)
;; for some reason python is fussy, and likes enters after every input
(let ((comint-process-echoes nil))
(mapc (lambda (statement) (insert statement) (comint-send-input))

View File

@ -214,7 +214,7 @@ last statement in BODY, as elisp."
org-babel-ruby-last-value-eval)
org-babel-ruby-eoe-indicator) "\n"))
(raw (org-babel-comint-with-output
(list buffer org-babel-ruby-eoe-indicator t full-body)
(buffer org-babel-ruby-eoe-indicator t full-body)
(insert full-body) (comint-send-input nil t)))
(results (cdr (member
org-babel-ruby-eoe-indicator

View File

@ -175,7 +175,7 @@ last statement in BODY."
(mapcar #'org-babel-sh-strip-weird-long-prompt
(mapcar #'org-babel-trim
(org-babel-comint-with-output
(list session org-babel-sh-eoe-output t full-body)
(session org-babel-sh-eoe-output t full-body)
(mapc (lambda (line) (insert line) (comint-send-input))
(strip-empty (split-string body "\n")))
(insert org-babel-sh-eoe-indicator)