diff options
| author | Eric Schulte <schulte.eric@gmail.com> | 2010-10-25 11:12:49 -0600 |
|---|---|---|
| committer | Eric Schulte <schulte.eric@gmail.com> | 2010-10-25 11:12:49 -0600 |
| commit | 62dbf404f54a370a0390e9dfb5c94af0fa4b2edd (patch) | |
| tree | 7b1357d5a841ee15550a2667a3509d74be45419b | |
| parent | 25d365a37346a408c1b72fc90f4d06f2c0a1b0e1 (diff) | |
| download | org-mode-62dbf404f54a370a0390e9dfb5c94af0fa4b2edd.tar.gz | |
ob-clojure: fixed error message when clojure binary is not found
* lisp/ob-clojure.el (org-babel-clojure-babel-clojure-cmd): fixed
error message when clojure binary is not found
| -rw-r--r-- | lisp/ob-clojure.el | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el index 7ee9499..4c0070b 100644 --- a/lisp/ob-clojure.el +++ b/lisp/ob-clojure.el @@ -91,28 +91,28 @@ (defvar swank-clojure-extra-classpaths) (defun org-babel-clojure-babel-clojure-cmd () "Create the command to start clojure according to current settings." - (if (and (not swank-clojure-binary) (not swank-clojure-classpath)) + (or (when swank-clojure-binary + (if (listp swank-clojure-binary) + swank-clojure-binary + (list swank-clojure-binary))) + (when swank-clojure-classpath + (delq + nil + (append + (list swank-clojure-java-path) + swank-clojure-extra-vm-args + (list + (when swank-clojure-library-paths + (concat "-Djava.library.path=" + (swank-clojure-concat-paths swank-clojure-library-paths))) + "-classpath" + (swank-clojure-concat-paths + (append + swank-clojure-classpath + swank-clojure-extra-classpaths)) + "clojure.main")))) (error "%s" (concat "You must specifiy either a `swank-clojure-binary' " - "or a `swank-clojure-jar-path'")) - (if swank-clojure-binary - (if (listp swank-clojure-binary) - swank-clojure-binary - (list swank-clojure-binary)) - (delq - nil - (append - (list swank-clojure-java-path) - swank-clojure-extra-vm-args - (list - (when swank-clojure-library-paths - (concat "-Djava.library.path=" - (swank-clojure-concat-paths swank-clojure-library-paths))) - "-classpath" - (swank-clojure-concat-paths - (append - swank-clojure-classpath - swank-clojure-extra-classpaths)) - "clojure.main")))))) + "or a `swank-clojure-classpath'")))) (defun org-babel-clojure-table-or-string (results) "Convert RESULTS to an elisp value. |