From 7b80fff9743144a592bf521967afab9b200f6ebc Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Sun, 1 Aug 2010 14:34:28 -0400 Subject: [PATCH] babel: matlab/octave: only (require 'matlab) when necessary 2010-08-01 Dan Davison * ob-octave.el only (require 'matlab) when necessary (org-babel-octave-initiate-session) (require) octave-inf or matlab as appropriate (org-babel-execute:matlab): remove (require) (org-babel-prep-session:matlab): remove (require) (org-babel-matlab-initiate-session): remove (require) --- lisp/ob-octave.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index f3cbf95de..8e99f86c5 100644 --- a/lisp/ob-octave.el +++ b/lisp/ob-octave.el @@ -85,8 +85,8 @@ end") (defun org-babel-execute:matlab (body params) "Execute a block of matlab code with Babel." - (require 'matlab) (org-babel-execute:octave body params 'matlab)) + (defun org-babel-execute:octave (body params &optional matlabp) "Execute a block of octave code with Babel." (let* ((processed-params (org-babel-process-params params)) @@ -112,8 +112,8 @@ end") (defun org-babel-prep-session:matlab (session params) "Prepare SESSION according to PARAMS." - (require 'matlab) (org-babel-prep-session:octave session params 'matlab)) + (defun org-babel-octave-var-to-octave (var) "Convert an emacs-lisp value into an octave variable. Converts an emacs-lisp variable into a string of octave code @@ -142,13 +142,13 @@ specifying a variable of the same value." "Create a matlab inferior process buffer. If there is not a current inferior-process-buffer in SESSION then create. Return the initialized session." - (require 'matlab) (org-babel-octave-initiate-session session params 'matlab)) + (defun org-babel-octave-initiate-session (&optional session params matlabp) "Create an octave inferior process buffer. If there is not a current inferior-process-buffer in SESSION then create. Return the initialized session." - (require 'octave-inf) + (if matlabp (require 'matlab) (require 'octave-inf)) (unless (string= session "none") (let ((session (or session (if matlabp "*Inferior Matlab*" "*Inferior Octave*"))))