diff options
| author | Sebastien Delafond <seb@debian.org> | 2013-12-29 17:44:50 +0100 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:31 +0200 |
| commit | 6c5e25df62a8618951b30a669f875a93c7944e0b (patch) | |
| tree | ddae85aa6440f29d4d0b4efa5ffa3d656900a8e8 /lisp/ob-R.el | |
| parent | 489f1deda8d0ec93810c342b427c1920b8c47cbb (diff) | |
| parent | 52fbfeb04b10aa78f24f339a352fe1161c0b37e4 (diff) | |
Imported Debian patch 8.2.4-1
Diffstat (limited to 'lisp/ob-R.el')
| -rw-r--r-- | lisp/ob-R.el | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el index 74d7513..58f5536 100644 --- a/lisp/ob-R.el +++ b/lisp/ob-R.el @@ -85,21 +85,22 @@ (or graphics-file (org-babel-R-graphical-output-file params)))) (mapconcat #'identity - ((lambda (inside) - (if graphics-file - (append - (list (org-babel-R-construct-graphics-device-call - graphics-file params)) - inside - (list "dev.off()")) - inside)) - (append - (when (cdr (assoc :prologue params)) - (list (cdr (assoc :prologue params)))) - (org-babel-variable-assignments:R params) - (list body) - (when (cdr (assoc :epilogue params)) - (list (cdr (assoc :epilogue params)))))) "\n"))) + (let ((inside + (append + (when (cdr (assoc :prologue params)) + (list (cdr (assoc :prologue params)))) + (org-babel-variable-assignments:R params) + (list body) + (when (cdr (assoc :epilogue params)) + (list (cdr (assoc :epilogue params))))))) + (if graphics-file + (append + (list (org-babel-R-construct-graphics-device-call + graphics-file params)) + inside + (list "dev.off()")) + inside)) + "\n"))) (defun org-babel-execute:R (body params) "Execute a block of R code. @@ -324,6 +325,8 @@ last statement in BODY, as elisp." column-names-p))) (output (org-babel-eval org-babel-R-command body)))) +(defvar ess-eval-visibly-p) + (defun org-babel-R-evaluate-session (session body result-type result-params column-names-p row-names-p) "Evaluate BODY in SESSION. |