diff options
| author | Stefan Monnier | 2013-11-12 14:11:22 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2013-11-12 14:11:22 -0500 |
| commit | 666ffc7e09d3f55e2ce370bc3cf0bda347ae2e21 (patch) | |
| tree | f9fd870f75195e853e0df4fd242055beacc360cc /lisp/org/ob-R.el | |
| parent | 32d15ad99ccc01985ac36db9f9fabdf721202b6d (diff) | |
| download | emacs-666ffc7e09d3f55e2ce370bc3cf0bda347ae2e21.tar.gz emacs-666ffc7e09d3f55e2ce370bc3cf0bda347ae2e21.zip | |
Address some byte-compiler warnings.
* lisp/org/ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* lisp/org/ob-calc.el (org--var-syms): Rename from `var-syms'.
* lisp/org/ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* lisp/org/ob-table.el (sbe): Move debug declaration.
* lisp/org/org-clock.el (org--msg-extra): Rename from `msg-extra'.
* lisp/org/org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* lisp/org/org-colview.el (org-agenda-overriding-columns-format):
* lisp/org/org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* lisp/org/ob-python.el (py-which-bufname, python-shell-buffer-name):
* lisp/org/ob-haskell.el (org-export-copy-to-kill-ring):
* lisp/org/ob-exp.el (org-link-search-inhibit-query):
* lisp/org/ob-R.el (ess-eval-visibly-p):
* lisp/org/ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* lisp/org/ox-odt.el (org-odt-hfy-face-to-css):
* lisp/org/org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* lisp/org/org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* lisp/org/ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* lisp/org/ob-sqlite.el (org-babel-sqlite-expand-vars):
* lisp/org/ob-sql.el (org-babel-sql-expand-vars):
* lisp/org/ob-shen.el (org-babel-execute:shen):
* lisp/org/ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* lisp/org/ob-scala.el (org-babel-scala-evaluate):
* lisp/org/ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* lisp/org/ob-picolisp.el (org-babel-execute:picolisp):
* lisp/org/ob-perl.el (org-babel-perl-evaluate):
* lisp/org/ob-maxima.el (org-babel-execute:maxima):
* lisp/org/ob-lisp.el (org-babel-execute:lisp):
* lisp/org/ob-java.el (org-babel-execute:java):
* lisp/org/ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* lisp/org/ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* lisp/org/ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* lisp/org/ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* lisp/org/ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* lisp/org/ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* lisp/org/ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
Diffstat (limited to 'lisp/org/ob-R.el')
| -rw-r--r-- | lisp/org/ob-R.el | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el index 74d7513df3e..58f5536675c 100644 --- a/lisp/org/ob-R.el +++ b/lisp/org/ob-R.el | |||
| @@ -85,21 +85,22 @@ | |||
| 85 | (or graphics-file (org-babel-R-graphical-output-file params)))) | 85 | (or graphics-file (org-babel-R-graphical-output-file params)))) |
| 86 | (mapconcat | 86 | (mapconcat |
| 87 | #'identity | 87 | #'identity |
| 88 | ((lambda (inside) | 88 | (let ((inside |
| 89 | (if graphics-file | 89 | (append |
| 90 | (append | 90 | (when (cdr (assoc :prologue params)) |
| 91 | (list (org-babel-R-construct-graphics-device-call | 91 | (list (cdr (assoc :prologue params)))) |
| 92 | graphics-file params)) | 92 | (org-babel-variable-assignments:R params) |
| 93 | inside | 93 | (list body) |
| 94 | (list "dev.off()")) | 94 | (when (cdr (assoc :epilogue params)) |
| 95 | inside)) | 95 | (list (cdr (assoc :epilogue params))))))) |
| 96 | (append | 96 | (if graphics-file |
| 97 | (when (cdr (assoc :prologue params)) | 97 | (append |
| 98 | (list (cdr (assoc :prologue params)))) | 98 | (list (org-babel-R-construct-graphics-device-call |
| 99 | (org-babel-variable-assignments:R params) | 99 | graphics-file params)) |
| 100 | (list body) | 100 | inside |
| 101 | (when (cdr (assoc :epilogue params)) | 101 | (list "dev.off()")) |
| 102 | (list (cdr (assoc :epilogue params)))))) "\n"))) | 102 | inside)) |
| 103 | "\n"))) | ||
| 103 | 104 | ||
| 104 | (defun org-babel-execute:R (body params) | 105 | (defun org-babel-execute:R (body params) |
| 105 | "Execute a block of R code. | 106 | "Execute a block of R code. |
| @@ -324,6 +325,8 @@ last statement in BODY, as elisp." | |||
| 324 | column-names-p))) | 325 | column-names-p))) |
| 325 | (output (org-babel-eval org-babel-R-command body)))) | 326 | (output (org-babel-eval org-babel-R-command body)))) |
| 326 | 327 | ||
| 328 | (defvar ess-eval-visibly-p) | ||
| 329 | |||
| 327 | (defun org-babel-R-evaluate-session | 330 | (defun org-babel-R-evaluate-session |
| 328 | (session body result-type result-params column-names-p row-names-p) | 331 | (session body result-type result-params column-names-p row-names-p) |
| 329 | "Evaluate BODY in SESSION. | 332 | "Evaluate BODY in SESSION. |