Merge Org version 8.2.3a.

[gnu-emacs] / lisp / org / ob-scala.el

diff --git a/lisp/org/ob-scala.el b/lisp/org/ob-scala.el
index 3a07b344b234047f93c55af0f2b739d5b90fdf08..7cb3099c00ff3bd461c10ccde53f2480aaa2df3b 100644 (file)
--- 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) ""))))))