Merge changes from Org 7.4 to current Org 7.7.

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

diff --git a/lisp/org/ob-octave.el b/lisp/org/ob-octave.el
index ae6c1513dee78d753a1b6e55b1c801ed1ef24c79..ac434b4abb61aabbf4f69165417250095bff35f2 100644 (file)
--- a/lisp/org/ob-octave.el
+++ b/lisp/org/ob-octave.el
@@ -1,11 +1,11 @@
 ;;; ob-octave.el --- org-babel functions for octave and matlab evaluation
 
-;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2010  Free Software Foundation, Inc.
 
 ;; Author: Dan Davison
 ;; Keywords: literate programming, reproducible research
 ;; Homepage: http://orgmode.org
-;; Version: 7.4
+;; Version: 7.7
 
 ;; This file is part of GNU Emacs.
 
@@ -88,13 +88,12 @@ end")
           body params (org-babel-variable-assignments:octave params)))
         (result (org-babel-octave-evaluate
                  session full-body result-type matlabp)))
-    (or out-file
-        (org-babel-reassemble-table
-         result
-         (org-babel-pick-name
-         (cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
-         (org-babel-pick-name
-         (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))))
+    (org-babel-reassemble-table
+     result
+     (org-babel-pick-name
+      (cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
+     (org-babel-pick-name
+      (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params))))))
 
 (defun org-babel-prep-session:matlab (session params)
   "Prepare SESSION according to PARAMS."
@@ -104,7 +103,7 @@ end")
   "Return list of octave statements assigning the block's variables"
   (mapcar
    (lambda (pair)
-     (format "%s=%s"
+     (format "%s=%s;"
             (car pair)
             (org-babel-octave-var-to-octave (cdr pair))))
    (mapcar #'cdr (org-babel-get-header params :var))))
@@ -259,5 +258,6 @@ This removes initial blank and comment lines and then calls
 
 (provide 'ob-octave)
 
+;; arch-tag: d8e5f68b-ba13-440a-a495-b653e989e704
 
 ;;; ob-octave.el ends here