From a8c1a49b77acfcf7986d427c77b6cc8a6082cd47 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Wed, 3 Mar 2010 16:11:04 +0000 Subject: [PATCH 1/3] babel: Read perl results remotely when necessary. --- contrib/babel/lisp/langs/org-babel-perl.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contrib/babel/lisp/langs/org-babel-perl.el b/contrib/babel/lisp/langs/org-babel-perl.el index 1ecac5388..0ea076485 100644 --- a/contrib/babel/lisp/langs/org-babel-perl.el +++ b/contrib/babel/lisp/langs/org-babel-perl.el @@ -115,10 +115,7 @@ last statement in BODY, as elisp." tmp-file)) ;; (message "buffer=%s" (buffer-string)) ;; debugging (shell-command-on-region (point-min) (point-max) "perl")) - (let ((raw (with-temp-buffer (insert-file-contents tmp-file) (buffer-string)))) - (if (or (member "code" result-params) (member "pp" result-params)) - raw - (org-babel-import-elisp-from-file tmp-file))))))) + (org-babel-import-elisp-from-file (org-babel-maybe-remote-file tmp-file)))))) ;; comint session evaluation (error "Sessions are not supported for Perl."))) From 54c7b04734bb8ad643156811af36ea5af28553c5 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Wed, 3 Mar 2010 21:59:32 +0000 Subject: [PATCH 2/3] babel: clojure: use shell-command-on-region --- contrib/babel/lisp/langs/org-babel-clojure.el | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/contrib/babel/lisp/langs/org-babel-clojure.el b/contrib/babel/lisp/langs/org-babel-clojure.el index 771ed79b1..c6901694b 100644 --- a/contrib/babel/lisp/langs/org-babel-clojure.el +++ b/contrib/babel/lisp/langs/org-babel-clojure.el @@ -230,13 +230,11 @@ or nil if \"none\" is specified" 'replace) (buffer-string))) (value - (let ((tmp-src-file (make-temp-file "clojure_babel_input_")) - (tmp-results-file (make-temp-file "clojure_babel_results_"))) - (with-temp-file tmp-src-file - (insert (format org-babel-clojure-wrapper-method body tmp-results-file tmp-results-file))) - (shell-command - (format "%s %s" (mapconcat #'identity (org-babel-clojure-babel-clojure-cmd) " ") - tmp-src-file)) + (let ((tmp-results-file (make-temp-file "clojure_babel_results_"))) + (with-temp-buffer + (insert (format org-babel-clojure-wrapper-method body tmp-results-file tmp-results-file)) + (shell-command-on-region (point-min) (point-max) + (mapconcat #'identity (org-babel-clojure-babel-clojure-cmd) " "))) (org-babel-clojure-table-or-string (with-temp-buffer (insert-file-contents tmp-results-file) (buffer-string)))))))) From ed7b8bfcca65b10493c3fbef11075a4d118cdb78 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Wed, 3 Mar 2010 22:00:08 +0000 Subject: [PATCH 3/3] babel: clojure: read results remotely when necessary --- contrib/babel/lisp/langs/org-babel-clojure.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/babel/lisp/langs/org-babel-clojure.el b/contrib/babel/lisp/langs/org-babel-clojure.el index c6901694b..c79acd9c4 100644 --- a/contrib/babel/lisp/langs/org-babel-clojure.el +++ b/contrib/babel/lisp/langs/org-babel-clojure.el @@ -236,7 +236,7 @@ or nil if \"none\" is specified" (shell-command-on-region (point-min) (point-max) (mapconcat #'identity (org-babel-clojure-babel-clojure-cmd) " "))) (org-babel-clojure-table-or-string - (with-temp-buffer (insert-file-contents tmp-results-file) (buffer-string)))))))) + (with-temp-buffer (insert-file-contents (org-babel-maybe-remote-file tmp-results-file)) (buffer-string)))))))) (defun org-babel-clojure-evaluate-session (buffer body &optional result-type) "Evaluate the body in the context of a clojure session"