summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2010-12-22 15:19:57 +0000
committerDan Davison <dandavison7@gmail.com>2010-12-22 15:19:57 +0000
commitf7bca4ed1a93013c9252872ecde9af6d55cce29f (patch)
tree5b5fee64a73fd8ba96703f359c96420238b5ff97
parent7fa375d632ebdf1261d65a5b05431a06524d6273 (diff)
downloadorg-mode-f7bca4ed1a93013c9252872ecde9af6d55cce29f.tar.gz
ob-R: Don't handle errors in R; expose to Org-babel error handling.
* lisp/ob-R.el (org-babel-R-write-object-command): Force evaluation of user code prior to the R exception-handling, so that errors in user code are unhandled.
-rw-r--r--lisp/ob-R.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ob-R.el b/lisp/ob-R.el
index d791f16..695d7ef 100644
--- a/lisp/ob-R.el
+++ b/lisp/ob-R.el
@@ -221,7 +221,8 @@ current code buffer."
(defvar org-babel-R-eoe-indicator "'org_babel_R_eoe'")
(defvar org-babel-R-eoe-output "[1] \"org_babel_R_eoe\"")
-(defvar org-babel-R-write-object-command "{function(object, transfer.file) {invisible(if(inherits(try(write.table(object, file=transfer.file, sep=\"\\t\", na=\"nil\",row.names=%s, col.names=%s, quote=FALSE), silent=TRUE),\"try-error\")) {if(!file.exists(transfer.file)) file.create(transfer.file)})}}(object=%s, transfer.file=\"%s\")")
+
+(defvar org-babel-R-write-object-command "{function(object, transfer.file) {object;invisible(if(inherits(try(write.table(object, file=transfer.file, sep=\"\\t\", na=\"nil\",row.names=%s, col.names=%s, quote=FALSE), silent=TRUE),\"try-error\")) {if(!file.exists(transfer.file)) file.create(transfer.file)})}}(object=%s, transfer.file=\"%s\")")
(defun org-babel-R-evaluate
(session body result-type column-names-p row-names-p)