summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-10-06 11:56:04 +0200
committerBastien Guerry <bzg@altern.org>2014-10-06 11:56:04 +0200
commite81b911c46e59b6698d05677e8acad4264855186 (patch)
tree0407476f1c16ca89ee83f1f1e4e4ea14fd19e31a
parent58d95c3a4fc0457ed78516a706ad79ae963a7538 (diff)
downloadorg-mode-e81b911c46e59b6698d05677e8acad4264855186.tar.gz
ob-clojure.el: Remove nrepl.el support
* ob-clojure.el (org-babel-clojure-backend) (org-babel-execute:clojure): Remove nrepl.el support.
-rw-r--r--lisp/ob-clojure.el24
1 files changed, 3 insertions, 21 deletions
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index a3e6cbe..d610da2 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/ob-clojure.el
@@ -24,33 +24,26 @@
;;; Commentary:
-;; Support for evaluating clojure code, relies either on Slime or
-;; on Nrepl.el for all eval.
+;; Support for evaluating clojure code
;; Requirements:
;; - clojure (at least 1.2.0)
;; - clojure-mode
-;; - either cider or nrepl.el or SLIME
+;; - either cider or SLIME
-;; For cider, see https://github.com/clojure-emacs/cider
+;; For Cider, see https://github.com/clojure-emacs/cider
;; For SLIME, the best way to install these components is by following
;; the directions as set out by Phil Hagelberg (Technomancy) on the
;; web page: http://technomancy.us/126
-;; For nREPL:
-;; get clojure with https://github.com/technomancy/leiningen
-;; get nrepl from MELPA (clojure-mode is a dependency).
-
;;; Code:
(require 'ob)
(eval-when-compile
(require 'cl))
(declare-function nrepl-send-string-sync "ext:nrepl-client" (input &optional ns session))
-(declare-function nrepl-current-connection-buffer "ext:nrepl" ())
-(declare-function nrepl-eval "ext:nrepl" (body))
(declare-function slime-eval "ext:slime" (sexp &optional package))
(defvar org-babel-tangle-lang-exts)
@@ -61,13 +54,11 @@
(defcustom org-babel-clojure-backend
(cond ((featurep 'cider) 'cider)
- ((featurep 'nrepl) 'nrepl)
(t 'slime))
"Backend used to evaluate Clojure code blocks."
:group 'org-babel
:type '(choice
(const :tag "cider" cider)
- (const :tag "nrepl" nrepl)
(const :tag "SLIME" slime)))
(defun org-babel-expand-body:clojure (body params)
@@ -104,15 +95,6 @@
(member "pp" result-params))
:stdout
:value)))))
- (nrepl
- (require 'nrepl)
- (setq result
- (if (nrepl-current-connection-buffer)
- (let* ((result (nrepl-eval expanded))
- (s (plist-get result :stdout))
- (r (plist-get result :value)))
- (if s (concat s "\n" r) r))
- (error "nREPL not connected! Use M-x nrepl-jack-in RET"))))
(slime
(require 'slime)
(with-temp-buffer