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-shen.el | |
| parent | f201cf3a8143b0b34b07769fc7d73dd14761b87b (diff) | |
| download | emacs-271672fad74cdbc9065d23d6e6cee1b8540f571b.tar.gz | |
Merge Org version 8.2.3a.
Diffstat (limited to 'lisp/org/ob-shen.el')
| -rw-r--r-- | lisp/org/ob-shen.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org/ob-shen.el b/lisp/org/ob-shen.el index ec31546a0ac..dc6313dc247 100644 --- a/lisp/org/ob-shen.el +++ b/lisp/org/ob-shen.el @@ -36,6 +36,7 @@ (require 'ob) (declare-function shen-eval-defun "ext:inf-shen" (&optional and-go)) +(declare-function org-babel-ruby-var-to-ruby "ob-ruby" (var)) (defvar org-babel-default-header-args:shen '() "Default header arguments for shen code blocks.") @@ -66,9 +67,8 @@ This function is called by `org-babel-execute-src-block'" (result-params (cdr (assoc :result-params params))) (full-body (org-babel-expand-body:shen body params))) ((lambda (results) - (if (or (member 'scalar result-params) - (member 'verbatim result-params)) - results + (org-babel-result-cond result-params + results (condition-case nil (org-babel-script-escape results) (error results)))) (with-temp-buffer |