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-ruby.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-ruby.el')
| -rw-r--r-- | lisp/org/ob-ruby.el | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el index af528314393..fe1ee0ff098 100644 --- a/lisp/org/ob-ruby.el +++ b/lisp/org/ob-ruby.el | |||
| @@ -139,13 +139,12 @@ specifying a variable of the same value." | |||
| 139 | "Convert RESULTS into an appropriate elisp value. | 139 | "Convert RESULTS into an appropriate elisp value. |
| 140 | If RESULTS look like a table, then convert them into an | 140 | If RESULTS look like a table, then convert them into an |
| 141 | Emacs-lisp table, otherwise return the results as a string." | 141 | Emacs-lisp table, otherwise return the results as a string." |
| 142 | ((lambda (res) | 142 | (let ((res (org-babel-script-escape results))) |
| 143 | (if (listp res) | 143 | (if (listp res) |
| 144 | (mapcar (lambda (el) (if (equal el 'nil) | 144 | (mapcar (lambda (el) (if (equal el 'nil) |
| 145 | org-babel-ruby-nil-to el)) | 145 | org-babel-ruby-nil-to el)) |
| 146 | res) | 146 | res) |
| 147 | res)) | 147 | res))) |
| 148 | (org-babel-script-escape results))) | ||
| 149 | 148 | ||
| 150 | (defun org-babel-ruby-initiate-session (&optional session params) | 149 | (defun org-babel-ruby-initiate-session (&optional session params) |
| 151 | "Initiate a ruby session. | 150 | "Initiate a ruby session. |
| @@ -204,12 +203,11 @@ return the value of the last statement in BODY, as elisp." | |||
| 204 | org-babel-ruby-pp-wrapper-method | 203 | org-babel-ruby-pp-wrapper-method |
| 205 | org-babel-ruby-wrapper-method) | 204 | org-babel-ruby-wrapper-method) |
| 206 | body (org-babel-process-file-name tmp-file 'noquote))) | 205 | body (org-babel-process-file-name tmp-file 'noquote))) |
| 207 | ((lambda (raw) | 206 | (let ((raw (org-babel-eval-read-file tmp-file))) |
| 208 | (if (or (member "code" result-params) | 207 | (if (or (member "code" result-params) |
| 209 | (member "pp" result-params)) | 208 | (member "pp" result-params)) |
| 210 | raw | 209 | raw |
| 211 | (org-babel-ruby-table-or-string raw))) | 210 | (org-babel-ruby-table-or-string raw)))))) |
| 212 | (org-babel-eval-read-file tmp-file))))) | ||
| 213 | ;; comint session evaluation | 211 | ;; comint session evaluation |
| 214 | (case result-type | 212 | (case result-type |
| 215 | (output | 213 | (output |