diff options
| author | Sebastien Delafond <seb@debian.org> | 2013-08-11 16:27:56 +0200 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:27 +0200 |
| commit | 53b246b7d66bfa03ab9bcf47d4647913b401e3d6 (patch) | |
| tree | b5ea4e732c2219456d13048feb05b37b22a76391 /lisp/ob-java.el | |
| parent | 8606e2621fc00fd8b334a06924aeef3aab7a2e4d (diff) | |
| parent | e32a45ed36d6000db4b39171149072d11b77af72 (diff) | |
Imported Debian patch 8.0.7-1
Diffstat (limited to 'lisp/ob-java.el')
| -rw-r--r-- | lisp/ob-java.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/ob-java.el b/lisp/ob-java.el index 75afda1..c0e9a53 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -1,6 +1,6 @@ ;;; ob-java.el --- org-babel functions for java evaluation -;; Copyright (C) 2011-2012 Free Software Foundation, Inc. +;; Copyright (C) 2011-2013 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -28,7 +28,6 @@ ;;; Code: (require 'ob) -(require 'ob-eval) (defvar org-babel-tangle-lang-exts) (add-to-list 'org-babel-tangle-lang-exts '("java" . "java")) @@ -58,11 +57,11 @@ (make-directory packagename 'parents)) ((lambda (results) (org-babel-reassemble-table - (if (member "vector" (cdr (assoc :result-params params))) - (let ((tmp-file (org-babel-temp-file "c-"))) + (org-babel-result-cond (cdr (assoc :result-params params)) + (org-babel-read results) + (let ((tmp-file (org-babel-temp-file "c-"))) (with-temp-file tmp-file (insert results)) - (org-babel-import-elisp-from-file tmp-file)) - (org-babel-read results)) + (org-babel-import-elisp-from-file tmp-file))) (org-babel-pick-name (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) (org-babel-pick-name |