diff options
| author | Sébastien Delafond <sdelafond@gmail.com> | 2015-11-27 17:40:50 +0100 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2015-11-27 17:40:50 +0100 |
| commit | 002ec053efdb50d946a84c264b57b7023e14eca1 (patch) | |
| tree | 278a6c1ad42f559292e680104f276804dc19b4b6 /lisp/ob-scala.el | |
| parent | c2164d4c4efe381b2689f455982bfc0586a09589 (diff) | |
| parent | f7ab8b6645e5b81dd3b1df053a3bf41b279696f4 (diff) | |
Merge tag 'upstream/8.3.2'
Upstream version 8.3.2
Diffstat (limited to 'lisp/ob-scala.el')
| -rw-r--r-- | lisp/ob-scala.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ob-scala.el b/lisp/ob-scala.el index 838bc8f..dfb72dd 100644 --- a/lisp/ob-scala.el +++ b/lisp/ob-scala.el @@ -1,6 +1,6 @@ ;;; ob-scala.el --- org-babel functions for Scala evaluation -;; Copyright (C) 2012-2014 Free Software Foundation, Inc. +;; Copyright (C) 2012-2015 Free Software Foundation, Inc. ;; Author: Andrzej Lichnerowicz ;; Keywords: literate programming, reproducible research @@ -78,8 +78,8 @@ print(str_result) (defun org-babel-scala-evaluate (session body &optional result-type result-params) "Evaluate BODY in external Scala process. -If RESULT-TYPE equals 'output then return standard output as a string. -If RESULT-TYPE equals 'value then return the value of the last statement +If RESULT-TYPE equals `output' then return standard output as a string. +If RESULT-TYPE equals `value' then return the value of the last statement in BODY as elisp." (when session (error "Sessions are not (yet) supported for Scala")) (case result-type |