Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

1 files changed, 3 insertions, 4 deletions

diff --git a/lisp/org/ob-java.el b/lisp/org/ob-java.el
index 4b3d454898b..f5edc6d53b5 100644
--- a/lisp/org/ob-java.el
+++ b/lisp/org/ob-java.el
@@ -58,6 +58,7 @@ parameters may be used, like javac -verbose"
          (src-file (concat classname ".java"))
          (cmpflag (or (cdr (assq :cmpflag params)) ""))
          (cmdline (or (cdr (assq :cmdline params)) ""))
+         (cmdargs (or (cdr (assq :cmdargs params)) ""))
          (full-body (org-babel-expand-body:generic body params)))
     (with-temp-file src-file (insert full-body))
     (org-babel-eval
@@ -66,10 +67,10 @@ parameters may be used, like javac -verbose"
     (unless (or (not packagename) (file-exists-p packagename))
       (make-directory packagename 'parents))
     (let ((results (org-babel-eval (concat org-babel-java-command
-                                           " " cmdline " " classname) "")))
+                                           " " cmdline " " classname " " cmdargs) "")))
       (org-babel-reassemble-table
        (org-babel-result-cond (cdr (assq :result-params params))
-         (org-babel-read results)
+         (org-babel-read results t)
          (let ((tmp-file (org-babel-temp-file "c-")))
            (with-temp-file tmp-file (insert results))
            (org-babel-import-elisp-from-file tmp-file)))
@@ -80,6 +81,4 @@ parameters may be used, like javac -verbose"
 
 (provide 'ob-java)
 
-
-
 ;;; ob-java.el ends here