|
@@ -27,8 +27,9 @@
|
|
|
;; Org-Babel support for evaluating R code
|
|
|
|
|
|
;;; Code:
|
|
|
-(require 'ob)
|
|
|
+
|
|
|
(require 'cl-lib)
|
|
|
+(require 'ob)
|
|
|
|
|
|
(declare-function orgtbl-to-tsv "org-table" (table params))
|
|
|
(declare-function R "ext:essd-r" (&optional start-args))
|
|
@@ -376,12 +377,12 @@ Has four %s escapes to be filled in:
|
|
|
body result-type result-params column-names-p row-names-p)))
|
|
|
|
|
|
(defun org-babel-R-evaluate-external-process
|
|
|
- (body result-type result-params column-names-p row-names-p)
|
|
|
+ (body result-type result-params column-names-p row-names-p)
|
|
|
"Evaluate BODY in external R process.
|
|
|
If RESULT-TYPE equals `output' then return standard output as a
|
|
|
string. If RESULT-TYPE equals `value' then return the value of the
|
|
|
last statement in BODY, as elisp."
|
|
|
- (case result-type
|
|
|
+ (cl-case result-type
|
|
|
(value
|
|
|
(let ((tmp-file (org-babel-temp-file "R-")))
|
|
|
(org-babel-eval org-babel-R-command
|
|
@@ -404,12 +405,12 @@ last statement in BODY, as elisp."
|
|
|
(defvar ess-eval-visibly-p)
|
|
|
|
|
|
(defun org-babel-R-evaluate-session
|
|
|
- (session body result-type result-params column-names-p row-names-p)
|
|
|
+ (session body result-type result-params column-names-p row-names-p)
|
|
|
"Evaluate BODY in SESSION.
|
|
|
If RESULT-TYPE equals `output' then return standard output as a
|
|
|
string. If RESULT-TYPE equals `value' then return the value of the
|
|
|
last statement in BODY, as elisp."
|
|
|
- (case result-type
|
|
|
+ (cl-case result-type
|
|
|
(value
|
|
|
(with-temp-buffer
|
|
|
(insert (org-babel-chomp body))
|