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-clojure.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-clojure.el')
| -rw-r--r-- | lisp/org/ob-clojure.el | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el index bc2bbc0d095..25b39f7f733 100644 --- a/lisp/org/ob-clojure.el +++ b/lisp/org/ob-clojure.el | |||
| @@ -24,17 +24,17 @@ | |||
| 24 | 24 | ||
| 25 | ;;; Commentary: | 25 | ;;; Commentary: |
| 26 | 26 | ||
| 27 | ;;; support for evaluating clojure code, relies on slime for all eval | 27 | ;; Support for evaluating clojure code, relies on slime for all eval. |
| 28 | 28 | ||
| 29 | ;;; Requirements: | 29 | ;;; Requirements: |
| 30 | 30 | ||
| 31 | ;;; - clojure (at least 1.2.0) | 31 | ;; - clojure (at least 1.2.0) |
| 32 | ;;; - clojure-mode | 32 | ;; - clojure-mode |
| 33 | ;;; - slime | 33 | ;; - slime |
| 34 | 34 | ||
| 35 | ;;; By far, the best way to install these components is by following | 35 | ;; By far, the best way to install these components is by following |
| 36 | ;;; the directions as set out by Phil Hagelberg (Technomancy) on the | 36 | ;; the directions as set out by Phil Hagelberg (Technomancy) on the |
| 37 | ;;; web page: http://technomancy.us/126 | 37 | ;; web page: http://technomancy.us/126 |
| 38 | 38 | ||
| 39 | ;;; Code: | 39 | ;;; Code: |
| 40 | (require 'ob) | 40 | (require 'ob) |
| @@ -77,16 +77,16 @@ | |||
| 77 | (require 'slime) | 77 | (require 'slime) |
| 78 | (with-temp-buffer | 78 | (with-temp-buffer |
| 79 | (insert (org-babel-expand-body:clojure body params)) | 79 | (insert (org-babel-expand-body:clojure body params)) |
| 80 | ((lambda (result) | 80 | (let ((result |
| 81 | (let ((result-params (cdr (assoc :result-params params)))) | 81 | (slime-eval |
| 82 | (org-babel-result-cond result-params | 82 | `(swank:eval-and-grab-output |
| 83 | result | 83 | ,(buffer-substring-no-properties (point-min) (point-max))) |
| 84 | (condition-case nil (org-babel-script-escape result) | 84 | (cdr (assoc :package params))))) |
| 85 | (error result))))) | 85 | (let ((result-params (cdr (assoc :result-params params)))) |
| 86 | (slime-eval | 86 | (org-babel-result-cond result-params |
| 87 | `(swank:eval-and-grab-output | 87 | result |
| 88 | ,(buffer-substring-no-properties (point-min) (point-max))) | 88 | (condition-case nil (org-babel-script-escape result) |
| 89 | (cdr (assoc :package params)))))) | 89 | (error result))))))) |
| 90 | 90 | ||
| 91 | (provide 'ob-clojure) | 91 | (provide 'ob-clojure) |
| 92 | 92 | ||