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-scala.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-scala.el')
| -rw-r--r-- | lisp/org/ob-scala.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/org/ob-scala.el b/lisp/org/ob-scala.el index 3a07b344b23..7cb3099c00f 100644 --- a/lisp/org/ob-scala.el +++ b/lisp/org/ob-scala.el @@ -31,9 +31,6 @@ ;;; Code: (require 'ob) -(require 'ob-ref) -(require 'ob-comint) -(require 'ob-eval) (eval-when-compile (require 'cl)) (defvar org-babel-tangle-lang-exts) ;; Autoloaded @@ -104,8 +101,8 @@ in BODY as elisp." (wrapper (format org-babel-scala-wrapper-method body))) (with-temp-file src-file (insert wrapper)) ((lambda (raw) - (if (member "code" result-params) - raw + (org-babel-result-cond result-params + raw (org-babel-scala-table-or-string raw))) (org-babel-eval (concat org-babel-scala-command " " src-file) "")))))) |