mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

slightly more graceful use of let*

This commit is contained in:
Eric Schulte 2009-06-13 17:35:01 -07:00
parent e39b5e848e
commit cd5fb8460d
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/langs/org-babel-python.el
View File

@ -112,15 +112,14 @@ BODY, if RESULT-TYPE equals 'value then return the value of the
last statement in BODY."
(org-babel-comint-in-buffer buffer
(let* ((full-body (mapconcat #'org-babel-trim
(list body org-babel-python-last-value-eval org-babel-python-eoe-indicator) "\n"))
(list body org-babel-python-last-value-eval org-babel-python-eoe-indicator) "\n"))
(raw (org-babel-comint-with-output buffer org-babel-python-eoe-indicator t
;; for some reason python is fussy, and likes enters after every input
(mapc (lambda (statement) (insert statement) (comint-send-input))
(split-string full-body "[\r\n]+"))))
results)
(setq results (delete org-babel-python-eoe-indicator
(results (delete org-babel-python-eoe-indicator
(cdr (member org-babel-python-eoe-indicator
(reverse (mapcar #'org-babel-trim raw))))))
(reverse (mapcar #'org-babel-trim raw)))))))
(setq results (mapcar #'org-babel-python-read-string results))
(org-babel-trim (case result-type
(output (mapconcat #'identity (reverse (cdr results)) "\n"))

6
lisp/langs/org-babel-ruby.el
View File

@ -101,11 +101,9 @@ last statement in BODY."
(list body org-babel-ruby-last-value-eval org-babel-ruby-eoe-indicator) "\n"))
(raw (org-babel-comint-with-output buffer org-babel-ruby-eoe-indicator t
(insert full-body) (comint-send-input)))
results)
;; clean up results
(setq results (cdr (member org-babel-ruby-eoe-indicator
(results (cdr (member org-babel-ruby-eoe-indicator
(reverse (mapcar #'org-babel-ruby-read-string
(mapcar #'org-babel-trim raw))))))
(mapcar #'org-babel-trim raw)))))))
(case result-type
(output (mapconcat #'identity (reverse (cdr results)) "\n"))
(value (car results))