diff options
| author | Bastien Guerry <bzg@gnu.org> | 2013-11-12 14:06:26 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2013-11-12 14:06:26 +0100 |
| commit | 271672fad74cdbc9065d23d6e6cee1b8540f571b (patch) | |
| tree | d322b956ec0e74ee33b22354ef00839b23b1618d /lisp/org/ob-clojure.el | |
| parent | f201cf3a8143b0b34b07769fc7d73dd14761b87b (diff) | |
| download | emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.tar.gz emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.tar.bz2 emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.zip | |
Merge Org version 8.2.3a.
Diffstat (limited to 'lisp/org/ob-clojure.el')
| -rw-r--r-- | lisp/org/ob-clojure.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el index b020498eb15..bc2bbc0d095 100644 --- a/lisp/org/ob-clojure.el +++ b/lisp/org/ob-clojure.el @@ -79,9 +79,8 @@ (insert (org-babel-expand-body:clojure body params)) ((lambda (result) (let ((result-params (cdr (assoc :result-params params)))) - (if (or (member "scalar" result-params) - (member "verbatim" result-params)) - result + (org-babel-result-cond result-params + result (condition-case nil (org-babel-script-escape result) (error result))))) (slime-eval |